1 files changed, 22 insertions, 22 deletions

diff --git a/gentoobrowse-api/unittests/testMaintenance.cpp b/gentoobrowse-api/unittests/testMaintenance.cpp
index a23444a..da0e6cd 100644
--- a/gentoobrowse-api/unittests/testMaintenance.cpp
+++ b/gentoobrowse-api/unittests/testMaintenance.cpp
@@ -15,8 +15,8 @@ class MaintenanceClientCombined : public Maintenance, public TestClient { };
 
 BOOST_FIXTURE_TEST_SUITE(maintenance, MaintenanceClientCombined)
 
-const boost::filesystem::path treeDir(binDir / "tree");
-const boost::filesystem::path fixturesDir(rootDir / "fixtures");
+const std::filesystem::path treeDir(binDir / "tree");
+const std::filesystem::path fixturesDir(rootDir / "fixtures");
 
 void dumpDb(DB::ConnectionPtr db);
 
@@ -69,14 +69,14 @@ dumpDb(DB::ConnectionPtr db)
 
 class M2 : public Gentoo::Service::Maintenance {
 	public:
-		typedef std::map<boost::filesystem::path, size_t> FileMap;
+		typedef std::map<std::filesystem::path, size_t> FileMap;
 
 		M2(const DB::ConnectionPoolPtr & d) :
 			Gentoo::Service::Maintenance(d)
 		{
 		}
 
-		void applyDiffOfFolders(const boost::filesystem::path & from, const boost::filesystem::path & to) const
+		void applyDiffOfFolders(const std::filesystem::path & from, const std::filesystem::path & to) const
 		{
 			auto dbc = db->get();
 			auto fromFiles = fileSet(from);
@@ -86,25 +86,25 @@ class M2 : public Gentoo::Service::Maintenance {
 			newFiles(changes, fromFiles, toFiles);
 			removedFiles(changes, fromFiles, toFiles);
 			changedFiles(changes, fromFiles, toFiles);
-			boost::filesystem::remove(treeDir);
-			boost::filesystem::create_symlink(to, treeDir);
+			std::filesystem::remove(treeDir);
+			std::filesystem::create_symlink(to, treeDir);
 			Gentoo::Repository repo = { 1, "gentoo", to.string(), "origin", "master", "" };
 			applyFileChanges(dbc.get(), "/", repo, changes);
-			boost::filesystem::remove(treeDir);
+			std::filesystem::remove(treeDir);
 		}
 
-		static FileMap fileSet(const boost::filesystem::path & p)
+		static FileMap fileSet(const std::filesystem::path & p)
 		{
 			FileMap found;
-			for (boost::filesystem::recursive_directory_iterator r(p); r != boost::filesystem::recursive_directory_iterator(); r++) {
-				if (boost::filesystem::is_regular(r->status())) {
-					found[boost::filesystem::relative(*r, p)] = boost::filesystem::file_size(*r);
+			for (std::filesystem::recursive_directory_iterator r(p); r != std::filesystem::recursive_directory_iterator(); r++) {
+				if (std::filesystem::is_regular_file(r->status())) {
+					found[std::filesystem::relative(*r, p)] = std::filesystem::file_size(*r);
 				}
 			}
 			return found;
 		}
 
-		static Gentoo::Service::PathParts split(const boost::filesystem::path & path)
+		static Gentoo::Service::PathParts split(const std::filesystem::path & path)
 		{
 			Gentoo::Service::PathParts pp;
 			for (const auto & p : path) {
@@ -155,8 +155,8 @@ BOOST_AUTO_TEST_CASE( refreshPackageTree )
 	insRepo->bindParamS(4, "8292397bf6a8c91215b03a558e8bc843aff25b64");
 	insRepo->execute();
 
-	boost::filesystem::remove_all(binDir / "empty");
-	boost::filesystem::create_directory(binDir / "empty");
+	std::filesystem::remove_all(binDir / "empty");
+	std::filesystem::create_directory(binDir / "empty");
 	auto p = std::make_shared<IceTray::MockPool>("GentooBrowseAPI", 1, 1);
 	M2 m2(p);
 
@@ -234,8 +234,8 @@ BOOST_AUTO_TEST_CASE( testUpdateGitRepository )
 {
 	auto db = DB::ConnectionPtr(DB::MockDatabase::openConnectionTo("GentooBrowseAPI"));
 	auto testRepo = binDir / "testrepo";
-	boost::filesystem::remove_all(testRepo);
-	boost::filesystem::create_directories(testRepo);
+	std::filesystem::remove_all(testRepo);
+	std::filesystem::create_directories(testRepo);
 	// Create a stub repo to update
 	git_libgit2_init();
 	git_repository * repo;
@@ -261,11 +261,11 @@ BOOST_AUTO_TEST_CASE( testUpdateGitRepository )
 	m->updateRepositories();
 
 	// Verify checkout
-	BOOST_REQUIRE(boost::filesystem::is_directory(testRepo));
-	BOOST_REQUIRE(boost::filesystem::is_directory(testRepo / "virtual"));
-	BOOST_REQUIRE(boost::filesystem::is_directory(testRepo / "net-misc"));
-	BOOST_REQUIRE(boost::filesystem::is_directory(testRepo / "net-misc" / "gentoobrowse-api"));
-	BOOST_REQUIRE(boost::filesystem::is_regular_file(testRepo / "net-misc" / "gentoobrowse-api" / "Manifest"));
+	BOOST_REQUIRE(std::filesystem::is_directory(testRepo));
+	BOOST_REQUIRE(std::filesystem::is_directory(testRepo / "virtual"));
+	BOOST_REQUIRE(std::filesystem::is_directory(testRepo / "net-misc"));
+	BOOST_REQUIRE(std::filesystem::is_directory(testRepo / "net-misc" / "gentoobrowse-api"));
+	BOOST_REQUIRE(std::filesystem::is_regular_file(testRepo / "net-misc" / "gentoobrowse-api" / "Manifest"));
 }
 
 BOOST_AUTO_TEST_CASE( testRefreshGitRepository )
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( testRefreshGitRepository )
 	insRepo->bindParamS(3, "master");
 	insRepo->bindParamS(4, "8292397bf6a8c91215b03a558e8bc843aff25b64");
 	insRepo->execute();
-	std::ifstream data((rootDir / "gitdata.sql").string());
+	std::ifstream data(rootDir / "gitdata.sql");
 	db->executeScript(data, rootDir);
 
 	BOOST_TEST_CONTEXT("Intiial values") {