Remove boost::filesystem in favour of std::filesystemp2pvr-0.3.3

11 files changed, 13 insertions, 14 deletions

diff --git a/p2pvr/daemon/storage.h b/p2pvr/daemon/storage.h
index c9c984d..f062b28 100644
--- a/p2pvr/daemon/storage.h
+++ b/p2pvr/daemon/storage.h
@@ -5,7 +5,7 @@
 #include <options.h>
 #include <string>
 #include <set>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 #include "temporaryIceAdapterObject.h"
 #include <visibility.h>
 #include <logger.h>
diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam
index 8c25c07..017beb1 100644
--- a/p2pvr/daemon/unittests/Jamfile.jam
+++ b/p2pvr/daemon/unittests/Jamfile.jam
@@ -1,7 +1,7 @@
 import testing ;
 
 lib boost_system ;
-lib boost_filesystem ;
+lib stdc++fs ;
 lib Ice : : <name>Ice++11 ;
 lib IceBox : : <name>IceBox++11 ;
 lib dbppcore : : : : <include>/usr/include/dbpp ;
@@ -41,7 +41,7 @@ lib testCommon :
 	<library>../../devices//p2pvrMockTuner
 	<library>../../devices//p2pvrdevices
 	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<implicit-dependency>../../ice
 	<library>../../ice
 	: :
@@ -55,7 +55,7 @@ lib testCommon :
 	<library>Ice
 	<library>IceBox
 	<library>boost_system
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../..//boost_utf
 	<library>../../devices//p2pvrMockTuner
 	<library>../../devices//mockdata
diff --git a/p2pvr/daemon/unittests/mockDevices.cpp b/p2pvr/daemon/unittests/mockDevices.cpp
index 135664f..b374e20 100644
--- a/p2pvr/daemon/unittests/mockDevices.cpp
+++ b/p2pvr/daemon/unittests/mockDevices.cpp
@@ -11,7 +11,7 @@ namespace P2PVR {
 		}
 
 		TunerPtr
-		MockDevices::openTuner(const boost::filesystem::path & path) const
+		MockDevices::openTuner(const std::filesystem::path & path) const
 		{
 			return std::make_shared<P2PVR::DVB::Testing::MockTuner>(path, ic);
 		}
diff --git a/p2pvr/daemon/unittests/mockDevices.h b/p2pvr/daemon/unittests/mockDevices.h
index a9ed170..596a7bd 100644
--- a/p2pvr/daemon/unittests/mockDevices.h
+++ b/p2pvr/daemon/unittests/mockDevices.h
@@ -11,7 +11,7 @@ namespace P2PVR {
 			public:
 				MockDevices(Ice::CommunicatorPtr ic);
 
-				TunerPtr openTuner(const boost::filesystem::path &) const override;
+				TunerPtr openTuner(const std::filesystem::path &) const override;
 
 			private:
 				Ice::CommunicatorPtr ic;
diff --git a/p2pvr/daemon/unittests/testErrorHandling.cpp b/p2pvr/daemon/unittests/testErrorHandling.cpp
index e38ac8e..0cb71bf 100644
--- a/p2pvr/daemon/unittests/testErrorHandling.cpp
+++ b/p2pvr/daemon/unittests/testErrorHandling.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE ErrorHandling
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testMaint.cpp b/p2pvr/daemon/unittests/testMaint.cpp
index feb5153..4c72933 100644
--- a/p2pvr/daemon/unittests/testMaint.cpp
+++ b/p2pvr/daemon/unittests/testMaint.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Maintenance
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <boost/algorithm/string/predicate.hpp>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
diff --git a/p2pvr/daemon/unittests/testRecording.cpp b/p2pvr/daemon/unittests/testRecording.cpp
index 533859a..63a54ad 100644
--- a/p2pvr/daemon/unittests/testRecording.cpp
+++ b/p2pvr/daemon/unittests/testRecording.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Recording
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testRecordings.cpp b/p2pvr/daemon/unittests/testRecordings.cpp
index b68a2a3..4c78ac9 100644
--- a/p2pvr/daemon/unittests/testRecordings.cpp
+++ b/p2pvr/daemon/unittests/testRecordings.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Recordings
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testSched.cpp b/p2pvr/daemon/unittests/testSched.cpp
index 8450a4c..f263d39 100644
--- a/p2pvr/daemon/unittests/testSched.cpp
+++ b/p2pvr/daemon/unittests/testSched.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Scheduler
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testSi.cpp b/p2pvr/daemon/unittests/testSi.cpp
index a894155..fc37681 100644
--- a/p2pvr/daemon/unittests/testSi.cpp
+++ b/p2pvr/daemon/unittests/testSi.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE SI
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
diff --git a/p2pvr/daemon/unittests/testStorage.cpp b/p2pvr/daemon/unittests/testStorage.cpp
index f186f4f..5e7032c 100644
--- a/p2pvr/daemon/unittests/testStorage.cpp
+++ b/p2pvr/daemon/unittests/testStorage.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Storage
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <options.h>
 #include <Ice/ObjectAdapter.h>
 #include <Ice/Service.h>
@@ -16,7 +16,6 @@
 using namespace P2PVR;
 using namespace P2PVR::Testing;
 
-const boost::filesystem::path storageRootDir = "/tmp/ut/p2pvr/recordings";
 namespace P2PVR {
 namespace Testing {
 class TestService : public StandardMockDatabase {