Use std::filesystem instead experimental one

uis246 · Dec 3, 2020 · 61cab4a · 61cab4a
1 parent f5c2598
commit 61cab4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp
@@ -1,8 +1,7 @@
 #include "AssetManager.hpp"
 #include "ModLoader.hpp"
 
-#include <fstream>
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include <nlohmann/json.hpp>
 #include <easylogging++.h>
@@ -12,7 +11,7 @@
 #include "Utility.hpp"
 #include "Plugin.hpp"
 
-namespace fs = std::experimental::filesystem::v1;
+namespace fs = std::filesystem;
 
 const fs::path pathToAssets = "./assets/";
 const std::string pathToAssetsList = "./items.json";

diff --git a/src/ModLoader.cpp b/src/ModLoader.cpp
@@ -6,6 +6,8 @@
 #include <nlohmann/json.hpp>
 #include <stb_image.h>
 
+namespace fs = std::filesystem;
+
 static std::vector<std::shared_ptr<ModLoader::Mod>> mods;
 
 void ModLoader::LoadMod(AssetTreeNode &node) noexcept {

diff --git a/src/ModLoader.hpp b/src/ModLoader.hpp
@@ -1,10 +1,9 @@
 #pragma once
 #include "AssetManager.hpp"
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace ModLoader {
-	namespace fs = std::experimental::filesystem::v1;
 	struct Mod{
 		std::string modid;
 		std::string dirname;
@@ -31,7 +30,7 @@ namespace ModLoader {
 	void ParseAssetLua(AssetTreeNode &node) noexcept;
 	void ParseAssetSound(AssetTreeNode &node) noexcept;
 
-	void WalkDirEntry(const fs::directory_entry &dirEntry, AssetTreeNode *node) noexcept;
+	void WalkDirEntry(const std::filesystem::directory_entry &dirEntry, AssetTreeNode *node) noexcept;
 
 	void RecursiveWalkAssetFiles(AssetTreeNode &assetNode, std::function<void(AssetTreeNode&)> fnc) noexcept;
 	void RecursiveWalkAssetPath(const std::string &assetPath, std::function<void(AssetTreeNode&)> fnc) noexcept;