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

---
 fs_interface/Device.h                       | 2 +-
 fs_interface/Dir.h                          | 2 +-
 fs_interface/File.h                         | 2 +-
 fs_interface/Symlink.h                      | 2 +-
 fstest/testutils/FileSystemTest.h           | 4 ++--
 fstest/testutils/FileTest.h                 | 2 +-
 fuse/Filesystem.h                           | 2 +-
 impl/FilesystemImpl.cpp                     | 2 +-
 impl/FilesystemImpl.h                       | 2 +-
 impl/IdList.h                               | 2 +-
 test/fuse/read/FuseReadReturnedDataTest.cpp | 2 +-
 test/fuse/readDir/FuseReadDirReturnTest.cpp | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fs_interface/Device.h b/fs_interface/Device.h
index 2899909d..85adab57 100644
--- a/fs_interface/Device.h
+++ b/fs_interface/Device.h
@@ -3,7 +3,7 @@
 #define FSPP_DEVICE_H_
 
 #include <boost/filesystem.hpp>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <sys/statvfs.h>
 
 namespace fspp {
diff --git a/fs_interface/Dir.h b/fs_interface/Dir.h
index fe07455d..836da444 100644
--- a/fs_interface/Dir.h
+++ b/fs_interface/Dir.h
@@ -3,7 +3,7 @@
 #define FSPP_DIR_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <string>
 
 namespace fspp {
diff --git a/fs_interface/File.h b/fs_interface/File.h
index 6d085d29..85b78917 100644
--- a/fs_interface/File.h
+++ b/fs_interface/File.h
@@ -3,7 +3,7 @@
 #define FSPP_FILE_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace fspp {
 class Device;
diff --git a/fs_interface/Symlink.h b/fs_interface/Symlink.h
index 5c3a11da..72db26b7 100644
--- a/fs_interface/Symlink.h
+++ b/fs_interface/Symlink.h
@@ -3,7 +3,7 @@
 #define FSPP_SYMLINK_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <string>
 
 namespace fspp {
diff --git a/fstest/testutils/FileSystemTest.h b/fstest/testutils/FileSystemTest.h
index d60a3d58..e5fb0ff8 100644
--- a/fstest/testutils/FileSystemTest.h
+++ b/fstest/testutils/FileSystemTest.h
@@ -4,8 +4,8 @@
 #include <google/gtest/gtest.h>
 #include <type_traits>
 #include <boost/static_assert.hpp>
-#include <messmer/cpp-utils/unique_ref.h>
-#include <messmer/cpp-utils/unique_ref_boost_optional_gtest_workaround.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 #include "../../fs_interface/Device.h"
 #include "../../fs_interface/Dir.h"
diff --git a/fstest/testutils/FileTest.h b/fstest/testutils/FileTest.h
index 614b5830..0c40eaa0 100644
--- a/fstest/testutils/FileTest.h
+++ b/fstest/testutils/FileTest.h
@@ -3,7 +3,7 @@
 
 #include "FileSystemTest.h"
 #include <messmer/cpp-utils/data/Data.h>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 template<class ConcreteFileSystemTestFixture>
 class FileTest: public FileSystemTest<ConcreteFileSystemTestFixture> {
diff --git a/fuse/Filesystem.h b/fuse/Filesystem.h
index d89bd2ac..d915979c 100644
--- a/fuse/Filesystem.h
+++ b/fuse/Filesystem.h
@@ -3,7 +3,7 @@
 #define FSPP_IMPL_FILESYSTEM_H_
 
 #include <boost/filesystem.hpp>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include "../fs_interface/Dir.h"
diff --git a/impl/FilesystemImpl.cpp b/impl/FilesystemImpl.cpp
index ebcffa5e..9bf92136 100644
--- a/impl/FilesystemImpl.cpp
+++ b/impl/FilesystemImpl.cpp
@@ -9,7 +9,7 @@
 #include "../fs_interface/File.h"
 
 
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 using namespace fspp;
 using cpputils::dynamic_pointer_move;
diff --git a/impl/FilesystemImpl.h b/impl/FilesystemImpl.h
index f4ba41da..eb78f858 100644
--- a/impl/FilesystemImpl.h
+++ b/impl/FilesystemImpl.h
@@ -5,7 +5,7 @@
 #include "FuseOpenFileList.h"
 #include "../fuse/Filesystem.h"
 
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace fspp {
 class Node;
diff --git a/impl/IdList.h b/impl/IdList.h
index 4b4ddace..010e18c6 100644
--- a/impl/IdList.h
+++ b/impl/IdList.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <mutex>
 #include <stdexcept>
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 namespace fspp {
 
diff --git a/test/fuse/read/FuseReadReturnedDataTest.cpp b/test/fuse/read/FuseReadReturnedDataTest.cpp
index 57db6aa6..324532e3 100644
--- a/test/fuse/read/FuseReadReturnedDataTest.cpp
+++ b/test/fuse/read/FuseReadReturnedDataTest.cpp
@@ -2,7 +2,7 @@
 #include <messmer/cpp-utils/data/Data.h>
 #include "../../testutils/InMemoryFile.h"
 #include "testutils/FuseReadTest.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 
 #include "../../../fuse/FuseErrnoException.h"
 
diff --git a/test/fuse/readDir/FuseReadDirReturnTest.cpp b/test/fuse/readDir/FuseReadDirReturnTest.cpp
index 358eb1dc..3c43b6cd 100644
--- a/test/fuse/readDir/FuseReadDirReturnTest.cpp
+++ b/test/fuse/readDir/FuseReadDirReturnTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseReadDirTest.h"
-#include <messmer/cpp-utils/unique_ref.h>
+#include <messmer/cpp-utils/pointer/unique_ref.h>
 #include "../../../fuse/FuseErrnoException.h"
 
 using ::testing::_;