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

---
 src/CryConfigLoader.h  | 2 +-
 src/CryNode.cpp        | 2 +-
 src/CryOpenFile.h      | 2 +-
 src/impl/DirBlob.h     | 2 +-
 src/impl/FileBlob.h    | 2 +-
 src/impl/SymlinkBlob.h | 2 +-
 test/CryFsTest.cpp     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CryConfigLoader.h b/src/CryConfigLoader.h
index 81a5825f..f70aaa5c 100644
--- a/src/CryConfigLoader.h
+++ b/src/CryConfigLoader.h
@@ -2,7 +2,7 @@
 #ifndef MESSMER_CRYFS_SRC_CRYCONFIGLOADER_H_
 #define MESSMER_CRYFS_SRC_CRYCONFIGLOADER_H_
 
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <boost/filesystem/path.hpp>
 #include "CryConfig.h"
 #include <messmer/blockstore/implementations/encrypted/ciphers/AES256_GCM.h>
diff --git a/src/CryNode.cpp b/src/CryNode.cpp
index f935102f..dab40039 100644
--- a/src/CryNode.cpp
+++ b/src/CryNode.cpp
@@ -6,7 +6,7 @@
 #include "CryDir.h"
 #include "CryFile.h"
 #include "messmer/fspp/fuse/FuseErrnoException.h"
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 
 namespace bf = boost::filesystem;
 
diff --git a/src/CryOpenFile.h b/src/CryOpenFile.h
index c3f5eaf9..94478048 100644
--- a/src/CryOpenFile.h
+++ b/src/CryOpenFile.h
@@ -4,7 +4,7 @@
 
 #include "messmer/fspp/fs_interface/OpenFile.h"
 #include <messmer/cpp-utils/macros.h>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace cryfs {
 class CryDevice;
diff --git a/src/impl/DirBlob.h b/src/impl/DirBlob.h
index 506f29ec..474d4d0a 100644
--- a/src/impl/DirBlob.h
+++ b/src/impl/DirBlob.h
@@ -6,7 +6,7 @@
 #include <messmer/blockstore/utils/Key.h>
 #include <messmer/cpp-utils/macros.h>
 #include <messmer/fspp/fs_interface/Dir.h>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 #include <vector>
 
diff --git a/src/impl/FileBlob.h b/src/impl/FileBlob.h
index 120eaf59..dc45aed0 100644
--- a/src/impl/FileBlob.h
+++ b/src/impl/FileBlob.h
@@ -3,7 +3,7 @@
 #define CRYFS_LIB_IMPL_FILEBLOB_H_
 
 #include <messmer/blobstore/interface/Blob.h>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace cryfs {
 
diff --git a/src/impl/SymlinkBlob.h b/src/impl/SymlinkBlob.h
index 64dcc79f..3088e60b 100644
--- a/src/impl/SymlinkBlob.h
+++ b/src/impl/SymlinkBlob.h
@@ -4,7 +4,7 @@
 
 #include <messmer/blobstore/interface/Blob.h>
 #include <boost/filesystem/path.hpp>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace cryfs {
 
diff --git a/test/CryFsTest.cpp b/test/CryFsTest.cpp
index c8d658e3..547607ad 100644
--- a/test/CryFsTest.cpp
+++ b/test/CryFsTest.cpp
@@ -1,7 +1,7 @@
 #include <google/gtest/gtest.h>
 #include <messmer/cpp-utils/tempfile/TempDir.h>
 #include <messmer/cpp-utils/tempfile/TempFile.h>
-#include <messmer/cpp-utils/pointer.h>
+#include <messmer/cpp-utils/pointer/cast.h>
 #include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
 #include "../src/CryDevice.h"
 #include "../src/CryDir.h"