Introduce filesystem_fs.h

9 files changed, 1 insertions, 19 deletions

diff --git a/toolsrc/src/commands_hash.cpp b/toolsrc/src/commands_hash.cpp
index 4b89f2894..17c191b78 100644
--- a/toolsrc/src/commands_hash.cpp
+++ b/toolsrc/src/commands_hash.cpp
@@ -1,8 +1,6 @@
 #include "vcpkg_Commands.h"
 #include "vcpkg_System.h"
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg
 {
     static void do_file_hash(fs::path const& path, std::wstring const& hashType)
diff --git a/toolsrc/src/commands_search.cpp b/toolsrc/src/commands_search.cpp
index 923368252..a604c5383 100644
--- a/toolsrc/src/commands_search.cpp
+++ b/toolsrc/src/commands_search.cpp
@@ -4,8 +4,6 @@
 #include "vcpkglib_helpers.h"
 #include "SourceParagraph.h"
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg
 {
     static std::vector<SourceParagraph> read_all_source_paragraphs(const vcpkg_paths& paths)
diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index ada065fd6..23962bcfe 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -10,12 +10,10 @@
 #include <Windows.h>
 #include <winhttp.h>
 #include <fstream>
-#include <filesystem>
+#include "filesystem_fs.h"
 #include "vcpkg_Strings.h"
 #include "vcpkg_System.h"
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg
 {
     static std::string GetCurrentDateTime()
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp
index 61fbba52a..1a09c99b7 100644
--- a/toolsrc/src/post_build_lint.cpp
+++ b/toolsrc/src/post_build_lint.cpp
@@ -1,4 +1,3 @@
-#include <filesystem>
 #include "vcpkg_paths.h"
 #include "package_spec.h"
 #include "vcpkg_Files.h"
@@ -8,8 +7,6 @@
 #include "BuildInfo.h"
 #include <regex>
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg { namespace PostBuildLint
 {
     enum class lint_status
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index b1fe76982..4b65ea972 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <unordered_map>
 #include <memory>
-#include <filesystem>
 #include <vector>
 #include <cassert>
 #include "vcpkg_Files.h"
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 86e7080e4..b86edb4ab 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -1,10 +1,7 @@
 #include "vcpkg_Files.h"
 #include <fstream>
-#include <filesystem>
 #include <regex>
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg {namespace Files
 {
     static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])");
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index cc7080069..cb3eb6584 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -3,8 +3,6 @@
 #include <Windows.h>
 #include <regex>
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg {namespace System
 {
     fs::path get_exe_path_of_current_process()
diff --git a/toolsrc/src/vcpkg_metrics_uploader.cpp b/toolsrc/src/vcpkg_metrics_uploader.cpp
index f1f4a52ed..63668d1d7 100644
--- a/toolsrc/src/vcpkg_metrics_uploader.cpp
+++ b/toolsrc/src/vcpkg_metrics_uploader.cpp
@@ -1,10 +1,8 @@
 #include "metrics.h"
-#include <filesystem>
 #include "vcpkg_Checks.h"
 #include "vcpkg_Files.h"
 #include <Windows.h>
 
-namespace fs = std::tr2::sys;
 using namespace vcpkg;
 
 int WINAPI
diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp
index 5347b79d8..b7e716307 100644
--- a/toolsrc/src/vcpkg_paths.cpp
+++ b/toolsrc/src/vcpkg_paths.cpp
@@ -1,4 +1,3 @@
-#include <filesystem>
 #include "expected.h"
 #include "vcpkg_paths.h"
 #include "metrics.h"