From 7fae2d1e5918b723fc6bb34c894bd688ea0a56eb Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Sun, 21 Jun 2015 17:43:45 +0200
Subject: [PATCH] Adapt to new cpp-utils

---
 implementations/onblocks/BlobStoreOnBlocks.cpp                | 2 +-
 implementations/onblocks/datatreestore/DataTree.cpp           | 4 ++--
 implementations/onblocks/datatreestore/DataTree.h             | 2 +-
 implementations/onblocks/datatreestore/impl/algorithms.cpp    | 2 +-
 implementations/onblocks/datatreestore/impl/algorithms.h      | 2 +-
 interface/BlobStore.h                                         | 2 +-
 test/implementations/onblocks/BlobStoreTest.cpp               | 2 +-
 .../onblocks/datanodestore/DataInnerNodeTest.cpp              | 2 +-
 .../onblocks/datanodestore/DataLeafNodeTest.cpp               | 2 +-
 .../onblocks/datatreestore/testutils/DataTreeTest.cpp         | 2 +-
 .../onblocks/datatreestore/testutils/TwoLevelDataFixture.h    | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/implementations/onblocks/BlobStoreOnBlocks.cpp b/implementations/onblocks/BlobStoreOnBlocks.cpp
index dfce1a68..b768cd56 100644
--- a/implementations/onblocks/BlobStoreOnBlocks.cpp
+++ b/implementations/onblocks/BlobStoreOnBlocks.cpp
@@ -7,7 +7,7 @@
 #include "datatreestore/DataTree.h"
 #include "BlobStoreOnBlocks.h"
 #include "BlobOnBlocks.h"
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 
 using std::unique_ptr;
 using std::make_unique;
diff --git a/implementations/onblocks/datatreestore/DataTree.cpp b/implementations/onblocks/datatreestore/DataTree.cpp
index 87e6101e..65e90e07 100644
--- a/implementations/onblocks/datatreestore/DataTree.cpp
+++ b/implementations/onblocks/datatreestore/DataTree.cpp
@@ -7,8 +7,8 @@
 
 #include "impl/algorithms.h"
 
-#include "messmer/cpp-utils/pointer.h"
-#include "messmer/cpp-utils/optional_ownership_ptr.h"
+#include "messmer/cpp-utils/pointer/cast.h"
+#include "messmer/cpp-utils/pointer/optional_ownership_ptr.h"
 #include <cmath>
 
 using blockstore::Key;
diff --git a/implementations/onblocks/datatreestore/DataTree.h b/implementations/onblocks/datatreestore/DataTree.h
index a9d01cda..18ce1ff8 100644
--- a/implementations/onblocks/datatreestore/DataTree.h
+++ b/implementations/onblocks/datatreestore/DataTree.h
@@ -4,7 +4,7 @@
 
 #include <memory>
 #include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/optional_ownership_ptr.h>
+#include <messmer/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>
diff --git a/implementations/onblocks/datatreestore/impl/algorithms.cpp b/implementations/onblocks/datatreestore/impl/algorithms.cpp
index c2b6e5d3..aafb41fa 100644
--- a/implementations/onblocks/datatreestore/impl/algorithms.cpp
+++ b/implementations/onblocks/datatreestore/impl/algorithms.cpp
@@ -1,5 +1,5 @@
 #include "algorithms.h"
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 #include <messmer/blockstore/utils/Key.h>
 
 #include "../../datanodestore/DataInnerNode.h"
diff --git a/implementations/onblocks/datatreestore/impl/algorithms.h b/implementations/onblocks/datatreestore/impl/algorithms.h
index 7c7d73d1..46d6c7ca 100644
--- a/implementations/onblocks/datatreestore/impl/algorithms.h
+++ b/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/optional_ownership_ptr.h>
+#include <messmer/cpp-utils/pointer/optional_ownership_ptr.h>
 
 namespace blobstore {
 namespace onblocks {
diff --git a/interface/BlobStore.h b/interface/BlobStore.h
index d9871495..71509aaf 100644
--- a/interface/BlobStore.h
+++ b/interface/BlobStore.h
@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "messmer/blockstore/utils/Key.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace blobstore {
 
diff --git a/test/implementations/onblocks/BlobStoreTest.cpp b/test/implementations/onblocks/BlobStoreTest.cpp
index 4dad7488..2f6e5e6f 100644
--- a/test/implementations/onblocks/BlobStoreTest.cpp
+++ b/test/implementations/onblocks/BlobStoreTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/BlobStoreTest.h"
-#include <messmer/cpp-utils/unique_ref_boost_optional_gtest_workaround.h>
+#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 using blockstore::Key;
 using cpputils::unique_ref;
diff --git a/test/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp b/test/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp
index 6f4b1d40..785a178d 100644
--- a/test/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp
+++ b/test/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp
@@ -8,7 +8,7 @@
 #include "messmer/blockstore/implementations/testfake/FakeBlock.h"
 
 #include <memory>
-#include "messmer/cpp-utils/pointer.h"
+#include "messmer/cpp-utils/pointer/cast.h"
 
 using ::testing::Test;
 
diff --git a/test/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp b/test/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp
index 02d19a2b..b0dfe3fe 100644
--- a/test/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp
+++ b/test/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp
@@ -4,7 +4,7 @@
 #include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
 #include <google/gtest/gtest.h>
 
-#include "messmer/cpp-utils/pointer.h"
+#include "messmer/cpp-utils/pointer/cast.h"
 
 #include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
 #include "messmer/blockstore/implementations/testfake/FakeBlock.h"
diff --git a/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp b/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp
index a91c41fe..4fa57946 100644
--- a/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp
+++ b/test/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp
@@ -1,7 +1,7 @@
 #include "DataTreeTest.h"
 
 #include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 
 using blobstore::onblocks::datanodestore::DataNodeStore;
 using blobstore::onblocks::datanodestore::DataNode;
diff --git a/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h b/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
index 8626d70d..9e9c49df 100644
--- a/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
+++ b/test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
@@ -3,7 +3,7 @@
 #define BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
 
 #include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 #include "LeafDataFixture.h"
 
 //TODO Rename, since we now allow any number of levels