Fix includes after merging repositories

src/blobstore/implementations/onblocks/BlobOnBlocks.cpp

@@ -4,7 +4,7 @@
 #include "datanodestore/DataLeafNode.h"
 #include "utils/Math.h"
 #include <cmath>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::function;
 using cpputils::unique_ref;

src/blobstore/implementations/onblocks/BlobStoreOnBlocks.cpp

@@ -1,14 +1,14 @@
 #include "parallelaccessdatatreestore/DataTreeRef.h"
 #include "parallelaccessdatatreestore/ParallelAccessDataTreeStore.h"
-#include <messmer/blockstore/implementations/parallelaccess/ParallelAccessBlockStore.h>
+#include <blockstore/implementations/parallelaccess/ParallelAccessBlockStore.h>
 #include "datanodestore/DataLeafNode.h"
 #include "datanodestore/DataNodeStore.h"
 #include "datatreestore/DataTreeStore.h"
 #include "datatreestore/DataTree.h"
 #include "BlobStoreOnBlocks.h"
 #include "BlobOnBlocks.h"
-#include <messmer/cpp-utils/pointer/cast.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/pointer/cast.h>
+#include <cpp-utils/assert/assert.h>
 
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;

src/blobstore/implementations/onblocks/BlobStoreOnBlocks.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_BLOCKED_BLOBSTOREONBLOCKS_H_
 
 #include "../../interface/BlobStore.h"
-#include "messmer/blockstore/interface/BlockStore.h"
+#include <blockstore/interface/BlockStore.h>
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/datanodestore/DataInnerNode.cpp

@@ -1,6 +1,6 @@
 #include "DataInnerNode.h"
 #include "DataNodeStore.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using blockstore::Block;
 using cpputils::Data;

src/blobstore/implementations/onblocks/datanodestore/DataInnerNode_ChildEntry.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_CHILDENTRY_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATAINNERNODE_CHILDENTRY_H_
 
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 
 namespace blobstore{
 namespace onblocks{

src/blobstore/implementations/onblocks/datanodestore/DataLeafNode.cpp

@@ -1,6 +1,6 @@
 #include "DataLeafNode.h"
 #include "DataInnerNode.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using blockstore::Block;
 using cpputils::Data;

src/blobstore/implementations/onblocks/datanodestore/DataNode.cpp

@@ -2,7 +2,7 @@
 #include "DataLeafNode.h"
 #include "DataNode.h"
 #include "DataNodeStore.h"
-#include <messmer/blockstore/utils/BlockStoreUtils.h>
+#include <blockstore/utils/BlockStoreUtils.h>
 
 using blockstore::Block;
 using blockstore::Key;

src/blobstore/implementations/onblocks/datanodestore/DataNode.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODE_H_
 
 #include "DataNodeView.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.cpp

@@ -1,10 +1,10 @@
 #include "DataInnerNode.h"
 #include "DataLeafNode.h"
 #include "DataNodeStore.h"
-#include "messmer/blockstore/interface/BlockStore.h"
-#include "messmer/blockstore/interface/Block.h"
-#include "messmer/blockstore/utils/BlockStoreUtils.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <blockstore/interface/BlockStore.h>
+#include <blockstore/interface/Block.h>
+#include <blockstore/utils/BlockStoreUtils.h>
+#include <cpp-utils/assert/assert.h>
 
 using blockstore::BlockStore;
 using blockstore::Block;

src/blobstore/implementations/onblocks/datanodestore/DataNodeStore.h

@@ -3,9 +3,9 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODESTORE_H_
 
 #include <memory>
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 #include "DataNodeView.h"
-#include <messmer/blockstore/utils/Key.h>
+#include <blockstore/utils/Key.h>
 
 namespace blockstore{
 class Block;

src/blobstore/implementations/onblocks/datanodestore/DataNodeView.h

@@ -2,11 +2,11 @@
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATANODESTORE_DATANODEVIEW_H_
 
-#include "messmer/blockstore/interface/Block.h"
+#include <blockstore/interface/Block.h>
 #include "../BlobStoreOnBlocks.h"
 #include "DataInnerNode_ChildEntry.h"
 
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 #include <memory>
 #include <stdexcept>

src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp

@@ -7,10 +7,10 @@
 
 #include "impl/algorithms.h"
 
-#include "messmer/cpp-utils/pointer/cast.h"
-#include "messmer/cpp-utils/pointer/optional_ownership_ptr.h"
+#include <cpp-utils/pointer/cast.h>
+#include <cpp-utils/pointer/optional_ownership_ptr.h>
 #include <cmath>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using blockstore::Key;
 using blobstore::onblocks::datanodestore::DataNodeStore;

src/blobstore/implementations/onblocks/datatreestore/DataTree.h

@@ -3,12 +3,12 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREE_H_
 
 #include <memory>
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/pointer/optional_ownership_ptr.h>
+#include <cpp-utils/macros.h>
+#include <cpp-utils/pointer/optional_ownership_ptr.h>
 #include "../datanodestore/DataNodeView.h"
 //TODO Replace with C++14 once std::shared_mutex is supported
 #include <boost/thread/shared_mutex.hpp>
-#include <messmer/blockstore/utils/Key.h>
+#include <blockstore/utils/Key.h>
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/datatreestore/DataTreeStore.h

@@ -3,9 +3,9 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREESTORE_H_
 
 #include <memory>
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include <messmer/blockstore/utils/Key.h>
+#include <cpp-utils/macros.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include <blockstore/utils/Key.h>
 #include <boost/optional.hpp>
 
 namespace blobstore {

src/blobstore/implementations/onblocks/datatreestore/impl/algorithms.cpp

@@ -1,10 +1,10 @@
 #include "algorithms.h"
-#include <messmer/cpp-utils/pointer/cast.h>
-#include <messmer/blockstore/utils/Key.h>
+#include <cpp-utils/pointer/cast.h>
+#include <blockstore/utils/Key.h>
 
 #include "../../datanodestore/DataInnerNode.h"
 #include "../../datanodestore/DataNodeStore.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::function;
 using cpputils::optional_ownership_ptr;

src/blobstore/implementations/onblocks/datatreestore/impl/algorithms.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_IMPL_ALGORITHMS_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_IMPL_ALGORITHMS_H_
 
-#include <messmer/cpp-utils/pointer/optional_ownership_ptr.h>
+#include <cpp-utils/pointer/optional_ownership_ptr.h>
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/parallelaccessdatatreestore/DataTreeRef.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_DATATREEREF_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_DATATREEREF_H_
 
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 #include "../datatreestore/DataTree.h"
 
 namespace blobstore {

src/blobstore/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStore.h

@@ -3,9 +3,9 @@
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTORE_H_
 
 #include <memory>
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/blockstore/utils/Key.h>
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <cpp-utils/macros.h>
+#include <blockstore/utils/Key.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 
 namespace blobstore {
 namespace onblocks {

src/blobstore/implementations/onblocks/parallelaccessdatatreestore/ParallelAccessDataTreeStoreAdapter.h

@@ -2,8 +2,8 @@
 #ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTOREADAPTER_H_
 #define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_PARALLELACCESSDATATREESTORE_PARALLELACCESSDATATREESTOREADAPTER_H_
 
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <cpp-utils/macros.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 #include "../datatreestore/DataTreeStore.h"
 #include "../datatreestore/DataTree.h"
 

src/blobstore/interface/Blob.h

@@ -4,8 +4,8 @@
 
 #include <cstring>
 #include <cstdint>
-#include <messmer/blockstore/utils/Key.h>
-#include <messmer/cpp-utils/data/Data.h>
+#include <blockstore/utils/Key.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blobstore {
 

src/blobstore/interface/BlobStore.h

@@ -6,8 +6,8 @@
 #include <string>
 #include <memory>
 
-#include "messmer/blockstore/utils/Key.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <blockstore/utils/Key.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace blobstore {
 

src/blockstore/CMakeLists.txt

@@ -35,6 +35,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   target_link_libraries(${PROJECT_NAME} PRIVATE rt)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils)
 
 target_add_boost(${PROJECT_NAME} filesystem system thread)

src/blockstore/implementations/caching/CachedBlock.h

@@ -4,7 +4,7 @@
 
 #include "../../interface/Block.h"
 
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace blockstore {
 namespace caching {

src/blockstore/implementations/caching/CachingBlockStore.cpp

@@ -4,8 +4,8 @@
 #include "../../interface/Block.h"
 
 #include <algorithm>
-#include <messmer/cpp-utils/pointer/cast.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/pointer/cast.h>
+#include <cpp-utils/assert/assert.h>
 
 using cpputils::dynamic_pointer_move;
 using cpputils::Data;

src/blockstore/implementations/caching/NewBlock.cpp

@@ -1,7 +1,7 @@
 #include "NewBlock.h"
 #include "CachingBlockStore.h"
-#include <messmer/cpp-utils/assert/assert.h>
-#include <messmer/cpp-utils/data/DataUtils.h>
+#include <cpp-utils/assert/assert.h>
+#include <cpp-utils/data/DataUtils.h>
 
 using cpputils::Data;
 using boost::none;

src/blockstore/implementations/caching/NewBlock.h

@@ -3,9 +3,9 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_NEWBLOCK_H_
 
 #include "../../interface/BlockStore.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 #include <memory>
 
 namespace blockstore {

src/blockstore/implementations/caching/cache/Cache.h

@@ -8,9 +8,9 @@
 #include <memory>
 #include <boost/optional.hpp>
 #include <future>
-#include <messmer/cpp-utils/assert/assert.h>
-#include <messmer/cpp-utils/lock/MutexPoolLock.h>
-#include <messmer/cpp-utils/pointer/gcc_4_8_compatibility.h>
+#include <cpp-utils/assert/assert.h>
+#include <cpp-utils/lock/MutexPoolLock.h>
+#include <cpp-utils/pointer/gcc_4_8_compatibility.h>
 
 namespace blockstore {
 namespace caching {

src/blockstore/implementations/caching/cache/CacheEntry.h

@@ -4,7 +4,7 @@
 
 #include <ctime>
 #include <memory>
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
 namespace blockstore {

src/blockstore/implementations/caching/cache/PeriodicTask.cpp

@@ -1,5 +1,5 @@
 #include "PeriodicTask.h"
-#include <messmer/cpp-utils/logging/logging.h>
+#include <cpp-utils/logging/logging.h>
 
 using std::function;
 using std::endl;

src/blockstore/implementations/caching/cache/PeriodicTask.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHE_PERIODICTASK_H_
 
 #include <functional>
-#include <messmer/cpp-utils/thread/LoopThread.h>
+#include <cpp-utils/thread/LoopThread.h>
 #include <boost/chrono.hpp>
 
 namespace blockstore {

src/blockstore/implementations/caching/cache/QueueMap.h

@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <cassert>
 #include <boost/optional.hpp>
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/macros.h>
+#include <cpp-utils/assert/assert.h>
 
 namespace blockstore {
 namespace caching {

src/blockstore/implementations/compressing/CompressedBlock.h

@@ -4,8 +4,8 @@
 
 #include "../../interface/Block.h"
 #include "../../interface/BlockStore.h"
-#include <messmer/cpp-utils/data/DataUtils.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/data/DataUtils.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <mutex>
 
 namespace blockstore {

src/blockstore/implementations/compressing/compressors/Gzip.cpp

@@ -1,5 +1,5 @@
 #include "Gzip.h"
-#include <cryptopp/cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
 
 using cpputils::Data;
 

src/blockstore/implementations/compressing/compressors/Gzip.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_COMPRESSING_COMPRESSORS_GZIP_H
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_COMPRESSING_COMPRESSORS_GZIP_H
 
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blockstore {
     namespace compressing {

src/blockstore/implementations/compressing/compressors/RunLengthEncoding.cpp

@@ -1,6 +1,6 @@
 #include "RunLengthEncoding.h"
 #include <sstream>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using cpputils::Data;
 using std::string;

src/blockstore/implementations/compressing/compressors/RunLengthEncoding.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_COMPRESSING_COMPRESSORS_RUNLENGTHENCODING_H
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_COMPRESSING_COMPRESSORS_RUNLENGTHENCODING_H
 
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blockstore {
     namespace compressing {

src/blockstore/implementations/encrypted/EncryptedBlock.h

@@ -3,18 +3,18 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCK_H_
 
 #include "../../interface/Block.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 #include "../../interface/BlockStore.h"
 
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 #include <memory>
 #include <iostream>
 #include <boost/optional.hpp>
-#include <messmer/cpp-utils/crypto/symmetric/Cipher.h>
-#include <messmer/cpp-utils/assert/assert.h>
-#include <messmer/cpp-utils/data/DataUtils.h>
+#include <cpp-utils/crypto/symmetric/Cipher.h>
+#include <cpp-utils/assert/assert.h>
+#include <cpp-utils/data/DataUtils.h>
 #include <mutex>
-#include <messmer/cpp-utils/logging/logging.h>
+#include <cpp-utils/logging/logging.h>
 
 namespace blockstore {
 namespace encrypted {

src/blockstore/implementations/encrypted/EncryptedBlockStore.h

@@ -3,8 +3,8 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_ENCRYPTED_ENCRYPTEDBLOCKSTORE_H_
 
 #include "../../interface/BlockStore.h"
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/pointer/cast.h>
+#include <cpp-utils/macros.h>
+#include <cpp-utils/pointer/cast.h>
 #include "EncryptedBlock.h"
 #include <iostream>
 

src/blockstore/implementations/inmemory/InMemoryBlock.cpp

@@ -1,8 +1,8 @@
 #include "InMemoryBlock.h"
 #include "InMemoryBlockStore.h"
 #include <cstring>
-#include <messmer/cpp-utils/data/DataUtils.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/data/DataUtils.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::make_shared;
 using std::istream;

src/blockstore/implementations/inmemory/InMemoryBlock.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCK_H_
 
 #include "../../interface/Block.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blockstore {
 namespace inmemory {

src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp

@@ -1,7 +1,7 @@
 #include "InMemoryBlock.h"
 #include "InMemoryBlockStore.h"
 #include <memory>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::make_unique;
 using std::string;

src/blockstore/implementations/inmemory/InMemoryBlockStore.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_INMEMORY_INMEMORYBLOCKSTORE_H_
 
 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 
 #include <mutex>
 #include <map>

src/blockstore/implementations/ondisk/OnDiskBlock.cpp

@@ -4,8 +4,8 @@
 #include "OnDiskBlock.h"
 #include "OnDiskBlockStore.h"
 #include "../../utils/FileDoesntExistException.h"
-#include <messmer/cpp-utils/data/DataUtils.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/data/DataUtils.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::istream;
 using std::ostream;

src/blockstore/implementations/ondisk/OnDiskBlock.h

@@ -4,10 +4,10 @@
 
 #include <boost/filesystem/path.hpp>
 #include "../../interface/Block.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 #include <iostream>
 
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <mutex>
 
 namespace blockstore {

src/blockstore/implementations/ondisk/OnDiskBlockStore.h

@@ -5,7 +5,7 @@
 #include <boost/filesystem.hpp>
 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
 
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 
 namespace blockstore {
 namespace ondisk {

src/blockstore/implementations/parallelaccess/BlockRef.h

@@ -2,9 +2,9 @@
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_BLOCKREF_H_
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_BLOCKREF_H_
 
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 #include "../../interface/Block.h"
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 #include <memory>
 
 namespace blockstore {

src/blockstore/implementations/parallelaccess/ParallelAccessBlockStore.cpp

@@ -2,8 +2,8 @@
 #include "ParallelAccessBlockStore.h"
 #include "ParallelAccessBlockStoreAdapter.h"
 #include <cassert>
-#include <messmer/cpp-utils/pointer/cast.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/pointer/cast.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::string;
 using std::promise;

src/blockstore/implementations/parallelaccess/ParallelAccessBlockStore.h

@@ -2,10 +2,10 @@
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTORE_H_
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTORE_H_
 
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 #include "BlockRef.h"
 #include "../../interface/BlockStore.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace blockstore {
 namespace parallelaccess {

src/blockstore/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h

@@ -2,8 +2,8 @@
 #ifndef MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTOREADAPTER_H_
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTOREADAPTER_H_
 
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/parallelaccessstore/ParallelAccessStore.h>
+#include <cpp-utils/macros.h>
+#include <parallelaccessstore/ParallelAccessStore.h>
 #include "../../interface/BlockStore.h"
 
 namespace blockstore {

src/blockstore/implementations/testfake/FakeBlock.cpp

@@ -1,8 +1,8 @@
 #include "FakeBlock.h"
 #include "FakeBlockStore.h"
 #include <cstring>
-#include <messmer/cpp-utils/assert/assert.h>
-#include <messmer/cpp-utils/data/DataUtils.h>
+#include <cpp-utils/assert/assert.h>
+#include <cpp-utils/data/DataUtils.h>
 
 using std::shared_ptr;
 using std::istream;

src/blockstore/implementations/testfake/FakeBlock.h

@@ -3,9 +3,9 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCK_H_
 
 #include "../../interface/Block.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 
 namespace blockstore {
 namespace testfake {

src/blockstore/implementations/testfake/FakeBlockStore.cpp

@@ -1,6 +1,6 @@
 #include "FakeBlock.h"
 #include "FakeBlockStore.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using std::make_shared;
 using std::string;

src/blockstore/implementations/testfake/FakeBlockStore.h

@@ -3,8 +3,8 @@
 #define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_TESTFAKE_FAKEBLOCKSTORE_H_
 
 #include "../../interface/helpers/BlockStoreWithRandomKeys.h"
-#include <messmer/cpp-utils/data/Data.h>
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/data/Data.h>
+#include <cpp-utils/macros.h>
 
 #include <mutex>
 #include <map>

src/blockstore/interface/BlockStore.h

@@ -5,8 +5,8 @@
 #include "Block.h"
 #include <string>
 #include <boost/optional.hpp>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/data/Data.h>
 
 namespace blockstore {
 

src/blockstore/interface/helpers/BlockStoreWithRandomKeys.h

@@ -4,7 +4,7 @@
 
 #include "../BlockStore.h"
 #include "../Block.h"
-#include <messmer/cpp-utils/random/Random.h>
+#include <cpp-utils/random/Random.h>
 
 namespace blockstore {
 

src/blockstore/utils/BlockStoreUtils.cpp

@@ -1,8 +1,8 @@
 #include "../interface/BlockStore.h"
 #include "BlockStoreUtils.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 #include <cassert>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 using cpputils::Data;
 using cpputils::unique_ref;

src/blockstore/utils/BlockStoreUtils.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_
 #define MESSMER_BLOCKSTORE_UTILS_BLOCKSTOREUTILS_H_
 
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace blockstore {
 class BlockStore;

src/blockstore/utils/Key.h

@@ -3,7 +3,7 @@
 #define MESSMER_BLOCKSTORE_UTILS_KEY_H_
 
 #include <string>
-#include <messmer/cpp-utils/data/FixedSizeData.h>
+#include <cpp-utils/data/FixedSizeData.h>
 
 namespace blockstore {
 

src/cpp-utils/CMakeLists.txt

@@ -40,7 +40,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   target_link_libraries(${PROJECT_NAME} PRIVATE rt)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-target_link_libraries(${PROJECT_NAME} PRIVATE curl)
+target_link_libraries(${PROJECT_NAME} PRIVATE pthread curl)
 
 # TODO From Crypto++ 5.7 on, it should support cmake with find_package().
 find_library(CryptoPP cryptopp)

test/blobstore/implementations/onblocks/BigBlobsTest.cpp

@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
-#include <messmer/blockstore/implementations/compressing/CompressingBlockStore.h>
-#include <messmer/blockstore/implementations/compressing/compressors/RunLengthEncoding.h>
-#include <messmer/blockstore/implementations/inmemory/InMemoryBlockStore.h>
-#include <messmer/blockstore/implementations/inmemory/InMemoryBlock.h>
-#include <messmer/cpp-utils/data/DataFixture.h>
-#include <messmer/cpp-utils/data/Data.h>
-#include "../../../implementations/onblocks/BlobStoreOnBlocks.h"
-#include "../../../implementations/onblocks/BlobOnBlocks.h"
+#include <blockstore/implementations/compressing/CompressingBlockStore.h>
+#include <blockstore/implementations/compressing/compressors/RunLengthEncoding.h>
+#include <blockstore/implementations/inmemory/InMemoryBlockStore.h>
+#include <blockstore/implementations/inmemory/InMemoryBlock.h>
+#include <cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/Data.h>
+#include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
+#include "blobstore/implementations/onblocks/BlobOnBlocks.h"
 
 using namespace blobstore;
 using namespace blobstore::onblocks;

test/blobstore/implementations/onblocks/BlobReadWriteTest.cpp

@@ -1,7 +1,7 @@
 #include "testutils/BlobStoreTest.h"
-#include <messmer/cpp-utils/data/Data.h>
-#include <messmer/cpp-utils/data/DataFixture.h>
-#include "../../../implementations/onblocks/datanodestore/DataNodeView.h"
+#include <cpp-utils/data/Data.h>
+#include <cpp-utils/data/DataFixture.h>
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeView.h"
 
 using cpputils::unique_ref;
 using ::testing::WithParamInterface;
@@ -60,7 +60,7 @@ TEST_F(BlobReadWriteTest, WritingImmediatelyFlushes_LargeSize) {
 TEST_F(BlobReadWriteTest, WritingCloseTo16ByteLimitDoesntDestroySize) {
   blob->resize(1);
   blob->write(randomData.data(), 32776, 4);
-  EXPECT_EQ(32780, blob->size());
+  EXPECT_EQ(32780u, blob->size());
 }
 
 struct DataRange {

test/blobstore/implementations/onblocks/BlobSizeTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/BlobStoreTest.h"
-#include <messmer/cpp-utils/data/Data.h>
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/Data.h>
+#include <cpp-utils/data/DataFixture.h>
 
 using namespace blobstore;
 using blockstore::Key;
@@ -21,12 +21,12 @@ constexpr uint32_t BlobSizeTest::MEDIUM_SIZE;
 constexpr uint32_t BlobSizeTest::LARGE_SIZE;
 
 TEST_F(BlobSizeTest, CreatedBlobIsEmpty) {
-  EXPECT_EQ(0, blob->size());
+  EXPECT_EQ(0u, blob->size());
 }
 
 TEST_F(BlobSizeTest, Growing_1Byte) {
   blob->resize(1);
-  EXPECT_EQ(1, blob->size());
+  EXPECT_EQ(1u, blob->size());
 }
 
 TEST_F(BlobSizeTest, Growing_Large) {
@@ -37,24 +37,24 @@ TEST_F(BlobSizeTest, Growing_Large) {
 TEST_F(BlobSizeTest, Shrinking_Empty) {
   blob->resize(LARGE_SIZE);
   blob->resize(0);
-  EXPECT_EQ(0, blob->size());
+  EXPECT_EQ(0u, blob->size());
 }
 
 TEST_F(BlobSizeTest, Shrinking_1Byte) {
   blob->resize(LARGE_SIZE);
   blob->resize(1);
-  EXPECT_EQ(1, blob->size());
+  EXPECT_EQ(1u, blob->size());
 }
 
 TEST_F(BlobSizeTest, ResizingToItself_Empty) {
   blob->resize(0);
-  EXPECT_EQ(0, blob->size());
+  EXPECT_EQ(0u, blob->size());
 }
 
 TEST_F(BlobSizeTest, ResizingToItself_1Byte) {
   blob->resize(1);
   blob->resize(1);
-  EXPECT_EQ(1, blob->size());
+  EXPECT_EQ(1u, blob->size());
 }
 
 TEST_F(BlobSizeTest, ResizingToItself_Large) {
@@ -67,7 +67,7 @@ TEST_F(BlobSizeTest, EmptyBlobStaysEmptyWhenLoading) {
   Key key = blob->key();
   reset(std::move(blob));
   auto loaded = loadBlob(key);
-  EXPECT_EQ(0, loaded->size());
+  EXPECT_EQ(0u, loaded->size());
 }
 
 TEST_F(BlobSizeTest, BlobSizeStaysIntactWhenLoading) {
@@ -81,34 +81,34 @@ TEST_F(BlobSizeTest, BlobSizeStaysIntactWhenLoading) {
 TEST_F(BlobSizeTest, WritingAtEndOfBlobGrowsBlob_Empty) {
   int value;
   blob->write(&value, 0, 4);
-  EXPECT_EQ(4, blob->size());
+  EXPECT_EQ(4u, blob->size());
 }
 
 TEST_F(BlobSizeTest, WritingAfterEndOfBlobGrowsBlob_Empty) {
   int value;
   blob->write(&value, 2, 4);
-  EXPECT_EQ(6, blob->size());
+  EXPECT_EQ(6u, blob->size());
 }
 
 TEST_F(BlobSizeTest, WritingOverEndOfBlobGrowsBlob_NonEmpty) {
   blob->resize(1);
   int value;
   blob->write(&value, 0, 4);
-  EXPECT_EQ(4, blob->size());
+  EXPECT_EQ(4u, blob->size());
 }
 
 TEST_F(BlobSizeTest, WritingAtEndOfBlobGrowsBlob_NonEmpty) {
   blob->resize(1);
   int value;
   blob->write(&value, 1, 4);
-  EXPECT_EQ(5, blob->size());
+  EXPECT_EQ(5u, blob->size());
 }
 
 TEST_F(BlobSizeTest, WritingAfterEndOfBlobGrowsBlob_NonEmpty) {
   blob->resize(1);
   int value;
   blob->write(&value, 2, 4);
-  EXPECT_EQ(6, blob->size());
+  EXPECT_EQ(6u, blob->size());
 }
 
 TEST_F(BlobSizeTest, ChangingSizeImmediatelyFlushes) {

test/blobstore/implementations/onblocks/BlobStoreTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/BlobStoreTest.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using blockstore::Key;
 using cpputils::unique_ref;

test/blobstore/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp

@@ -1,14 +1,14 @@
-#include <google/gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#include "../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataNodeStore.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeStore.h"
 
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlock.h"
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <blockstore/implementations/testfake/FakeBlock.h>
 
 #include <memory>
-#include "messmer/cpp-utils/pointer/cast.h"
+#include <cpp-utils/pointer/cast.h>
 
 using ::testing::Test;
 

test/blobstore/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp

@@ -1,14 +1,14 @@
-#include "../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataNodeStore.h"
-#include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
-#include <google/gtest/gtest.h>
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeStore.h"
+#include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
+#include <gtest/gtest.h>
 
-#include "messmer/cpp-utils/pointer/cast.h"
+#include <cpp-utils/pointer/cast.h>
 
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlock.h"
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <blockstore/implementations/testfake/FakeBlock.h>
+#include <cpp-utils/data/DataFixture.h>
 
 using ::testing::Test;
 using ::testing::WithParamInterface;

test/blobstore/implementations/onblocks/datanodestore/DataNodeStoreTest.cpp

@@ -1,13 +1,13 @@
-#include "../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataNode.h"
-#include "../../../../implementations/onblocks/datanodestore/DataNodeStore.h"
-#include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
-#include <google/gtest/gtest.h>
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeStore.h"
+#include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
+#include <gtest/gtest.h>
 
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlock.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <blockstore/implementations/testfake/FakeBlock.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using ::testing::Test;
 using cpputils::unique_ref;
@@ -109,29 +109,29 @@ TEST_F(DataNodeStoreTest, NodeIsNotLoadableAfterDeleting) {
 }
 
 TEST_F(DataNodeStoreTest, NumNodesIsCorrectOnEmptyNodestore) {
-  EXPECT_EQ(0, nodeStore->numNodes());
+  EXPECT_EQ(0u, nodeStore->numNodes());
 }
 
 TEST_F(DataNodeStoreTest, NumNodesIsCorrectAfterAddingOneLeafNode) {
   nodeStore->createNewLeafNode();
-  EXPECT_EQ(1, nodeStore->numNodes());
+  EXPECT_EQ(1u, nodeStore->numNodes());
 }
 
 TEST_F(DataNodeStoreTest, NumNodesIsCorrectAfterRemovingTheLastNode) {
   auto leaf = nodeStore->createNewLeafNode();
   nodeStore->remove(std::move(leaf));
-  EXPECT_EQ(0, nodeStore->numNodes());
+  EXPECT_EQ(0u, nodeStore->numNodes());
 }
 
 TEST_F(DataNodeStoreTest, NumNodesIsCorrectAfterAddingTwoNodes) {
   auto leaf = nodeStore->createNewLeafNode();
   auto node = nodeStore->createNewInnerNode(*leaf);
-  EXPECT_EQ(2, nodeStore->numNodes());
+  EXPECT_EQ(2u, nodeStore->numNodes());
 }
 
 TEST_F(DataNodeStoreTest, NumNodesIsCorrectAfterRemovingANode) {
   auto leaf = nodeStore->createNewLeafNode();
   auto node = nodeStore->createNewInnerNode(*leaf);
   nodeStore->remove(std::move(node));
-  EXPECT_EQ(1, nodeStore->numNodes());
+  EXPECT_EQ(1u, nodeStore->numNodes());
 }

test/blobstore/implementations/onblocks/datanodestore/DataNodeViewTest.cpp

@@ -1,10 +1,10 @@
-#include "../../../../implementations/onblocks/datanodestore/DataNodeView.h"
-#include <google/gtest/gtest.h>
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeView.h"
+#include <gtest/gtest.h>
 
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlock.h"
-#include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <blockstore/implementations/testfake/FakeBlock.h>
+#include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
+#include <cpp-utils/data/DataFixture.h>
 
 using ::testing::Test;
 using ::testing::WithParamInterface;

test/blobstore/implementations/onblocks/datatreestore/DataTreeStoreTest.cpp

@@ -1,9 +1,9 @@
 #include "testutils/DataTreeTest.h"
 
-#include "../../../../implementations/onblocks/datanodestore/DataNodeStore.h"
-#include "../../../../implementations/onblocks/datatreestore/DataTreeStore.h"
-#include <messmer/blockstore/implementations/testfake/FakeBlockStore.h>
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeStore.h"
+#include "blobstore/implementations/onblocks/datatreestore/DataTreeStore.h"
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using blockstore::testfake::FakeBlockStore;
 using blockstore::Key;
@@ -49,6 +49,6 @@ TEST_F(DataTreeStoreTest, RemovingTreeRemovesAllNodesOfTheTree) {
   treeStore.remove(std::move(tree1));
 
   //Check that the only remaining node is tree2
-  EXPECT_EQ(1, nodeStore->numNodes());
+  EXPECT_EQ(1u, nodeStore->numNodes());
   EXPECT_NE(none, treeStore.load(tree2_key));
 }

test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_NumStoredBytes.cpp

@@ -1,5 +1,5 @@
 #include "testutils/DataTreeTest.h"
-#include <google/gmock/gmock.h>
+#include <gmock/gmock.h>
 
 using ::testing::_;
 using ::testing::WithParamInterface;
@@ -18,7 +18,7 @@ public:
 
 TEST_F(DataTreeTest_NumStoredBytes, CreatedTreeIsEmpty) {
   auto tree = treeStore.createNewTree();
-  EXPECT_EQ(0, tree->numStoredBytes());
+  EXPECT_EQ(0u, tree->numStoredBytes());
 }
 
 class DataTreeTest_NumStoredBytes_P: public DataTreeTest_NumStoredBytes, public WithParamInterface<uint32_t> {};

test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeByTraversing.cpp

@@ -1,7 +1,7 @@
 #include "testutils/DataTreeTest.h"
 #include "testutils/TwoLevelDataFixture.h"
-#include "../../../../implementations/onblocks/utils/Math.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
+#include <cpp-utils/data/Data.h>
 
 #include <tuple>
 

test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_ResizeNumBytes.cpp

@@ -1,7 +1,7 @@
 #include "testutils/DataTreeTest.h"
 #include "testutils/TwoLevelDataFixture.h"
-#include "../../../../implementations/onblocks/utils/Math.h"
-#include <messmer/cpp-utils/data/Data.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
+#include <cpp-utils/data/Data.h>
 
 #include <tuple>
 

test/blobstore/implementations/onblocks/datatreestore/DataTreeTest_TraverseLeaves.cpp

@@ -1,5 +1,5 @@
 #include "testutils/DataTreeTest.h"
-#include <google/gmock/gmock.h>
+#include <gmock/gmock.h>
 
 using ::testing::_;
 

test/blobstore/implementations/onblocks/datatreestore/impl/GetLowestInnerRightBorderNodeWithLessThanKChildrenOrNullTest.cpp

@@ -1,11 +1,11 @@
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../testutils/DataTreeTest.h"
-#include "../../../../../implementations/onblocks/datatreestore/DataTree.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "../../../../../implementations/onblocks/datatreestore/impl/algorithms.h"
+#include "blobstore/implementations/onblocks/datatreestore/DataTree.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include "blobstore/implementations/onblocks/datatreestore/impl/algorithms.h"
 
 using ::testing::Test;
 using std::pair;

test/blobstore/implementations/onblocks/datatreestore/impl/GetLowestRightBorderNodeWithMoreThanOneChildOrNullTest.cpp

@@ -1,11 +1,11 @@
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "../testutils/DataTreeTest.h"
-#include "../../../../../implementations/onblocks/datatreestore/DataTree.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include "../../../../../implementations/onblocks/datatreestore/impl/algorithms.h"
+#include "blobstore/implementations/onblocks/datatreestore/DataTree.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include "blobstore/implementations/onblocks/datatreestore/impl/algorithms.h"
 
 using ::testing::Test;
 using std::pair;

test/blobstore/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp

@@ -1,8 +1,8 @@
 #include "DataTreeTest.h"
 
-#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include <messmer/cpp-utils/pointer/cast.h>
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include <cpp-utils/pointer/cast.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using blobstore::onblocks::datanodestore::DataNodeStore;
 using blobstore::onblocks::datanodestore::DataNode;

test/blobstore/implementations/onblocks/datatreestore/testutils/DataTreeTest.h

@@ -2,13 +2,13 @@
 #ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
 #define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_DATATREETEST_H_
 
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
-#include "../../../../../implementations/onblocks/datanodestore/DataNodeStore.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataInnerNode.h"
-#include "../../../../../implementations/onblocks/datanodestore/DataLeafNode.h"
-#include "../../../../../implementations/onblocks/datatreestore/DataTree.h"
-#include "../../../../../implementations/onblocks/datatreestore/DataTreeStore.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataNodeStore.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataInnerNode.h"
+#include "blobstore/implementations/onblocks/datanodestore/DataLeafNode.h"
+#include "blobstore/implementations/onblocks/datatreestore/DataTree.h"
+#include "blobstore/implementations/onblocks/datatreestore/DataTreeStore.h"
 
 class DataTreeTest: public ::testing::Test {
 public:

test/blobstore/implementations/onblocks/datatreestore/testutils/LeafDataFixture.h

@@ -2,9 +2,9 @@
 #ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
 #define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_LEAFDATAFIXTURE_H_
 
-#include <google/gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/DataFixture.h>
 
 // A data fixture containing data for a leaf.
 // The class can fill this data into a given leaf

test/blobstore/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h

@@ -2,10 +2,10 @@
 #ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
 #define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
 
-#include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/pointer/cast.h>
+#include <cpp-utils/macros.h>
+#include <cpp-utils/pointer/cast.h>
 #include "LeafDataFixture.h"
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 //TODO Rename, since we now allow any number of levels
 // A data fixture containing data for a two-level tree (one inner node with leaf children).

test/blobstore/implementations/onblocks/testutils/BlobStoreTest.cpp

@@ -1,7 +1,7 @@
 #include "BlobStoreTest.h"
 
-#include <messmer/blockstore/implementations/testfake/FakeBlockStore.h>
-#include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
+#include <blockstore/implementations/testfake/FakeBlockStore.h>
+#include "blobstore/implementations/onblocks/BlobStoreOnBlocks.h"
 
 using blobstore::onblocks::BlobStoreOnBlocks;
 using blockstore::testfake::FakeBlockStore;

test/blobstore/implementations/onblocks/testutils/BlobStoreTest.h

@@ -2,9 +2,9 @@
 #ifndef MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_TESTUTILS_BLOBSTORETEST_H_
 #define MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_TESTUTILS_BLOBSTORETEST_H_
 
-#include <google/gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#include "../../../../interface/BlobStore.h"
+#include "blobstore/interface/BlobStore.h"
 
 class BlobStoreTest: public ::testing::Test {
 public:

test/blobstore/implementations/onblocks/utils/CeilDivisionTest.cpp

@@ -1,5 +1,5 @@
-#include <google/gtest/gtest.h>
-#include "../../../../implementations/onblocks/utils/Math.h"
+#include <gtest/gtest.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
 
 #include <limits>
 

test/blobstore/implementations/onblocks/utils/CeilLogTest.cpp

@@ -1,5 +1,5 @@
-#include <google/gtest/gtest.h>
-#include "../../../../implementations/onblocks/utils/Math.h"
+#include <gtest/gtest.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
 
 #include <limits>
 

test/blobstore/implementations/onblocks/utils/IntPowTest.cpp

@@ -1,5 +1,5 @@
-#include <google/gtest/gtest.h>
-#include "../../../../implementations/onblocks/utils/Math.h"
+#include <gtest/gtest.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
 
 using namespace blobstore::onblocks::utils;
 using ::testing::Test;

test/blobstore/implementations/onblocks/utils/MaxZeroSubtractionTest.cpp

@@ -1,5 +1,5 @@
-#include <google/gtest/gtest.h>
-#include "../../../../implementations/onblocks/utils/Math.h"
+#include <gtest/gtest.h>
+#include "blobstore/implementations/onblocks/utils/Math.h"
 
 #include <limits>
 

test/blockstore/implementations/caching/CachingBlockStoreTest.cpp

@@ -1,8 +1,8 @@
-#include "../../../implementations/caching/CachingBlockStore.h"
-#include "../../../implementations/testfake/FakeBlockStore.h"
+#include "blockstore/implementations/caching/CachingBlockStore.h"
+#include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "../../testutils/BlockStoreTest.h"
-#include "google/gtest/gtest.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <gtest/gtest.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 
 using blockstore::BlockStore;

test/blockstore/implementations/caching/cache/CacheTest_MoveConstructor.cpp

@@ -1,6 +1,6 @@
-#include <google/gtest/gtest.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include "../../../../implementations/caching/cache/Cache.h"
+#include <gtest/gtest.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include "blockstore/implementations/caching/cache/Cache.h"
 #include "testutils/MinimalKeyType.h"
 #include "testutils/CopyableMovableValueType.h"
 

test/blockstore/implementations/caching/cache/CacheTest_PushAndPop.cpp

@@ -1,9 +1,9 @@
 #include "testutils/CacheTest.h"
 
-#include "../../../../implementations/caching/cache/Cache.h"
+#include "blockstore/implementations/caching/cache/Cache.h"
 #include "testutils/MinimalKeyType.h"
 #include "testutils/MinimalValueType.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using ::testing::Test;
 
@@ -48,7 +48,7 @@ TEST_F(CacheTest_PushAndPop, FullCache) {
     push(i, 2*i);
   }
   for(unsigned int i = 0; i < MAX_ENTRIES; ++i) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
 }
 
@@ -60,7 +60,7 @@ TEST_F(CacheTest_PushAndPop, FullCache_PushNonOrdered_PopOrdered) {
     push(i, 2*i);
   }
   for(unsigned int i = 0; i < MAX_ENTRIES; ++i) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
 }
 
@@ -69,10 +69,10 @@ TEST_F(CacheTest_PushAndPop, FullCache_PushOrdered_PopNonOrdered) {
     push(i, 2*i);
   }
   for(unsigned int i = 1; i < MAX_ENTRIES; i += 2) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
   for(unsigned int i = 0; i < MAX_ENTRIES; i += 2) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
 }
 
@@ -100,10 +100,10 @@ TEST_F(CacheTest_PushAndPop, FullCache_PushNonOrdered_PopNonOrdered) {
     push(i, 2*i);
   }
   for(int i = roundDownToOdd(MAX_ENTRIES-1); i >= 0; i -= 2) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
   for(unsigned int i = 0; i < MAX_ENTRIES; i += 2) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
 }
 
@@ -116,7 +116,7 @@ TEST_F(CacheTest_PushAndPop, MoreThanFullCache) {
   EXPECT_EQ(boost::none, pop(1));
   //Check the other elements are still there
   for(unsigned int i = 2; i < MAX_ENTRIES + 2; ++i) {
-    EXPECT_EQ(2*i, pop(i).value());
+    EXPECT_EQ((signed int)(2*i), pop(i).value());
   }
 }
 

test/blockstore/implementations/caching/cache/CacheTest_RaceCondition.cpp

@@ -3,7 +3,7 @@
 #include <thread>
 #include <memory>
 #include <future>
-#include <messmer/cpp-utils/lock/ConditionBarrier.h>
+#include <cpp-utils/lock/ConditionBarrier.h>
 
 using namespace blockstore::caching;
 using std::chrono::seconds;

test/blockstore/implementations/caching/cache/PeriodicTaskTest.cpp

@@ -1,6 +1,6 @@
-#include <google/gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#include "../../../../implementations/caching/cache/PeriodicTask.h"
+#include "blockstore/implementations/caching/cache/PeriodicTask.h"
 
 #include <mutex>
 #include <condition_variable>

test/blockstore/implementations/caching/cache/QueueMapTest_MoveConstructor.cpp

@@ -1,6 +1,6 @@
-#include <google/gtest/gtest.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include "../../../../implementations/caching/cache/QueueMap.h"
+#include <gtest/gtest.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include "blockstore/implementations/caching/cache/QueueMap.h"
 #include "testutils/MinimalKeyType.h"
 #include "testutils/CopyableMovableValueType.h"
 

test/blockstore/implementations/caching/cache/QueueMapTest_Values.cpp

@@ -1,5 +1,5 @@
 #include "testutils/QueueMapTest.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 class QueueMapTest_Values: public QueueMapTest {};
 

test/blockstore/implementations/caching/cache/testutils/CacheTest.h

@@ -2,8 +2,8 @@
 #ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
 #define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
 
-#include <google/gtest/gtest.h>
-#include "../../../../../implementations/caching/cache/Cache.h"
+#include <gtest/gtest.h>
+#include "blockstore/implementations/caching/cache/Cache.h"
 #include "MinimalKeyType.h"
 #include "MinimalValueType.h"
 #include <boost/optional.hpp>

test/blockstore/implementations/caching/cache/testutils/MinimalValueType.h

@@ -2,9 +2,9 @@
 #ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_
 #define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_MINIMALVALUETYPE_H_
 
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 #include <cassert>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 // This is a not-default-constructible non-copyable but moveable Value type
 class MinimalValueType {

test/blockstore/implementations/caching/cache/testutils/QueueMapTest.h

@@ -2,9 +2,9 @@
 #ifndef MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
 #define MESSMER_BLOCKSTORE_TEST_IMPLEMENTATIONS_CACHING_CACHE_TESTUTILS_QUEUEMAPTEST_H_
 
-#include <google/gtest/gtest.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include "../../../../../implementations/caching/cache/QueueMap.h"
+#include <gtest/gtest.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include "blockstore/implementations/caching/cache/QueueMap.h"
 #include "MinimalKeyType.h"
 #include "MinimalValueType.h"
 #include <boost/optional.hpp>

test/blockstore/implementations/compressing/CompressingBlockStoreTest.cpp

@@ -1,9 +1,9 @@
-#include "../../../implementations/compressing/CompressingBlockStore.h"
-#include "../../../implementations/compressing/compressors/Gzip.h"
-#include "../../../implementations/compressing/compressors/RunLengthEncoding.h"
-#include "../../../implementations/testfake/FakeBlockStore.h"
+#include "blockstore/implementations/compressing/CompressingBlockStore.h"
+#include "blockstore/implementations/compressing/compressors/Gzip.h"
+#include "blockstore/implementations/compressing/compressors/RunLengthEncoding.h"
+#include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "../../testutils/BlockStoreTest.h"
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
 using ::testing::Test;
 

test/blockstore/implementations/compressing/compressors/testutils/CompressorTest.cpp

@@ -1,7 +1,7 @@
-#include <google/gtest/gtest.h>
-#include "../../../../../implementations/compressing/compressors/Gzip.h"
-#include "../../../../../implementations/compressing/compressors/RunLengthEncoding.h"
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <gtest/gtest.h>
+#include "blockstore/implementations/compressing/compressors/Gzip.h"
+#include "blockstore/implementations/compressing/compressors/RunLengthEncoding.h"
+#include <cpp-utils/data/DataFixture.h>
 
 using namespace blockstore::compressing;
 using cpputils::Data;

test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Generic.cpp

@@ -1,10 +1,11 @@
-#include <messmer/cpp-utils/crypto/symmetric/ciphers.h>
-#include <messmer/cpp-utils/crypto/symmetric/Cipher.h>
-#include "../../../implementations/encrypted/EncryptedBlockStore.h"
-#include "../../../implementations/testfake/FakeBlockStore.h"
+#include <cpp-utils/crypto/symmetric/ciphers.h>
+#include <cpp-utils/crypto/symmetric/Cipher.h>
+#include "blockstore/implementations/encrypted/EncryptedBlockStore.h"
+#include "blockstore/implementations/testfake/FakeBlockStore.h"
 #include "../../testutils/BlockStoreTest.h"
-#include <messmer/cpp-utils/test/crypto/symmetric/testutils/FakeAuthenticatedCipher.h>
-#include "google/gtest/gtest.h"
+//TODO Move FakeAuthenticatedCipher out of test folder to normal folder. Dependencies should not point into tests of other modules.
+#include "../../../cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h"
+#include <gtest/gtest.h>
 
 using ::testing::Test;
 

test/blockstore/implementations/encrypted/EncryptedBlockStoreTest_Specific.cpp

@@ -1,9 +1,9 @@
-#include <google/gtest/gtest.h>
-#include <messmer/cpp-utils/test/crypto/symmetric/testutils/FakeAuthenticatedCipher.h>
-#include "../../../implementations/encrypted/EncryptedBlockStore.h"
-#include "../../../implementations/testfake/FakeBlockStore.h"
-#include "../../../utils/BlockStoreUtils.h"
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <gtest/gtest.h>
+#include "../../../cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h"
+#include "blockstore/implementations/encrypted/EncryptedBlockStore.h"
+#include "blockstore/implementations/testfake/FakeBlockStore.h"
+#include "blockstore/utils/BlockStoreUtils.h"
+#include <cpp-utils/data/DataFixture.h>
 
 using ::testing::Test;
 

test/blockstore/implementations/inmemory/InMemoryBlockStoreTest.cpp

@@ -1,9 +1,9 @@
-#include "../../../implementations/inmemory/InMemoryBlock.h"
-#include "../../../implementations/inmemory/InMemoryBlockStore.h"
+#include "blockstore/implementations/inmemory/InMemoryBlock.h"
+#include "blockstore/implementations/inmemory/InMemoryBlockStore.h"
 #include "../../testutils/BlockStoreTest.h"
 #include "../../testutils/BlockStoreWithRandomKeysTest.h"
-#include "google/gtest/gtest.h"
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <gtest/gtest.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 
 using blockstore::BlockStore;

test/blockstore/implementations/ondisk/OnDiskBlockStoreTest.cpp

@@ -1,10 +1,10 @@
-#include "../../../implementations/ondisk/OnDiskBlock.h"
-#include "../../../implementations/ondisk/OnDiskBlockStore.h"
+#include "blockstore/implementations/ondisk/OnDiskBlock.h"
+#include "blockstore/implementations/ondisk/OnDiskBlockStore.h"
 #include "../../testutils/BlockStoreTest.h"
 #include "../../testutils/BlockStoreWithRandomKeysTest.h"
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
-#include "messmer/cpp-utils/tempfile/TempDir.h"
+#include <cpp-utils/tempfile/TempDir.h>
 
 
 using blockstore::BlockStore;