5 files changed, 13 insertions, 13 deletions
diff --git a/project2/basics/Jamfile.jam b/project2/basics/Jamfile.jam
index e1be712..3a53d54 100644
--- a/project2/basics/Jamfile.jam
+++ b/project2/basics/Jamfile.jam
@@ -2,7 +2,7 @@ alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
 	;
-lib boost_filesystem : : <name>boost_filesystem ;
+lib stdc++fs ;
 lib dl ;
 
 build-project unittests ;
@@ -19,7 +19,7 @@ lib p2basics :
 	<include>.
 	<library>glibmm
 	<library>dl
-	<library>boost_filesystem
+	<library>stdc++fs
 	<library>../common//p2common
 	: :
 	<include>.
diff --git a/project2/basics/options/preload.cpp b/project2/basics/options/preload.cpp
index 506be1d..1968023 100644
--- a/project2/basics/options/preload.cpp
+++ b/project2/basics/options/preload.cpp
@@ -2,12 +2,12 @@
 #include <options.h>
 #include <library.h>
 #include <appInstance.h>
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 #include <map>
 #include <dlfcn.h>
 #include <logger.h>
 
-using namespace boost::filesystem;
+using namespace std::filesystem;
 
 class Preload {
 	public:
diff --git a/project2/basics/unittests/Jamfile.jam b/project2/basics/unittests/Jamfile.jam
index c5b14c6..5892cd9 100644
--- a/project2/basics/unittests/Jamfile.jam
+++ b/project2/basics/unittests/Jamfile.jam
@@ -14,7 +14,7 @@ run
 	<library>../../common//p2common
 	<library>..//p2basics
 	<library>../../ut//p2ut
-	<library>..//boost_filesystem
+	<library>..//stdc++fs
 	:
 	testLibraries :
 	;
@@ -28,7 +28,7 @@ run
 	<library>../../ut//p2ut
 	<library>../../xml//p2xml
 	<library>../../url//p2url
-	<library>..//boost_filesystem
+	<library>..//stdc++fs
 	:
 	standardTests :
 	;
diff --git a/project2/basics/unittests/testLibraries.cpp b/project2/basics/unittests/testLibraries.cpp
index a1aef90..c43d382 100644
--- a/project2/basics/unittests/testLibraries.cpp
+++ b/project2/basics/unittests/testLibraries.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Client
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include <filesystem>
 #include <testOptionsSource.h>
 #include <exceptions.h>
 #include <library.h>
@@ -9,8 +9,8 @@
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
-const boost::filesystem::path root(XSTR(ROOT));
-const auto self = boost::filesystem::canonical("/proc/self/exe");
+const std::filesystem::path root(XSTR(ROOT));
+const auto self = std::filesystem::canonical("/proc/self/exe");
 
 BOOST_FIXTURE_TEST_SUITE( Core, TestAppInstance );
 
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE( load_and_unload_library )
 	// Path to test lib needs passing in
 	BOOST_REQUIRE_EQUAL(2, args.size());
 	auto libraryPath = args[1];
-	BOOST_REQUIRE(boost::filesystem::exists(libraryPath));
+	BOOST_REQUIRE(std::filesystem::exists(libraryPath));
 
 	BOOST_REQUIRE_THROW(TaskFactory::get("DummyTask"), AdHoc::NoSuchPluginException);
 
diff --git a/project2/basics/unittests/testViews.cpp b/project2/basics/unittests/testViews.cpp
index 2303f1c..1dbb30e 100644
--- a/project2/basics/unittests/testViews.cpp
+++ b/project2/basics/unittests/testViews.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE Views
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <filesystem>
 #include <xmlScriptParser.h>
 #include <testOptionsSource.h>
 #include <testScriptHost.h>
@@ -8,11 +8,11 @@
 #include <testAppInstance.h>
 
 std::shared_ptr<TestScriptHost>
-executeRowViewTest(ExecContext * ec, const boost::filesystem::path & script, const boost::filesystem::path & expected)
+executeRowViewTest(ExecContext * ec, const std::filesystem::path & script, const std::filesystem::path & expected)
 {
 	TestOptionsSource::LoadTestOptions({
 			{ "common.datasourceRoot", rootDir.string() },
-			{ "application.dataroot", ("file://" / rootDir / "data").string() },
+			{ "application.dataroot", "file://" + (rootDir / "data").string() },
 		});
 	BOOST_TEST_CHECKPOINT("Load");
 	ScriptReaderPtr r = std::make_shared<XmlScriptParser>(script);