[vcpkg_paths] Use fs alias in all places within the header

2 files changed, 15 insertions, 17 deletions

diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index d13c73b0b..046b6836c 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -9,28 +9,28 @@ namespace vcpkg
 
     struct vcpkg_paths
     {
-        static expected<vcpkg_paths> create(const std::tr2::sys::path& vcpkg_root_dir);
+        static expected<vcpkg_paths> create(const fs::path& vcpkg_root_dir);
 
         fs::path package_dir(const package_spec& spec) const;
         fs::path port_dir(const package_spec& spec) const;
         bool is_valid_triplet(const triplet& t) const;
 
-        std::tr2::sys::path root;
-        std::tr2::sys::path packages;
-        std::tr2::sys::path buildtrees;
-        std::tr2::sys::path downloads;
-        std::tr2::sys::path ports;
-        std::tr2::sys::path installed;
-        std::tr2::sys::path triplets;
+        fs::path root;
+        fs::path packages;
+        fs::path buildtrees;
+        fs::path downloads;
+        fs::path ports;
+        fs::path installed;
+        fs::path triplets;
 
-        std::tr2::sys::path buildsystems;
-        std::tr2::sys::path buildsystems_msbuild_targets;
+        fs::path buildsystems;
+        fs::path buildsystems_msbuild_targets;
 
-        std::tr2::sys::path vcpkg_dir;
-        std::tr2::sys::path vcpkg_dir_status_file;
-        std::tr2::sys::path vcpkg_dir_info;
-        std::tr2::sys::path vcpkg_dir_updates;
+        fs::path vcpkg_dir;
+        fs::path vcpkg_dir_status_file;
+        fs::path vcpkg_dir_info;
+        fs::path vcpkg_dir_updates;
 
-        std::tr2::sys::path ports_cmake;
+        fs::path ports_cmake;
     };
 }
diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp
index 463f62c80..982eb9970 100644
--- a/toolsrc/src/vcpkg_paths.cpp
+++ b/toolsrc/src/vcpkg_paths.cpp
@@ -5,8 +5,6 @@
 #include "vcpkg_System.h"
 #include "package_spec.h"
 
-namespace fs = std::tr2::sys;
-
 namespace vcpkg
 {
     expected<vcpkg_paths> vcpkg_paths::create(const fs::path& vcpkg_root_dir)