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

This commit is contained in:
Alexander Karatarakis 2016-09-30 16:34:55 -07:00
parent 3f5275ed9f
commit df55e93b18
2 changed files with 15 additions and 17 deletions

View File

@ -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;
};
}

View File

@ -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)