diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-29 12:35:27 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-29 15:02:56 -0700 |
| commit | 8e3ee0523072c9330474a13507782cccb2b2be06 (patch) | |
| tree | 492bcaad148d91a47687651a912836fc06679e35 | |
| parent | 033f577c51c1e830fb27048c561ff76985855b2d (diff) | |
| download | vcpkg-8e3ee0523072c9330474a13507782cccb2b2be06.tar.gz vcpkg-8e3ee0523072c9330474a13507782cccb2b2be06.zip | |
Rename validate_triplet to is_valid_triplet
| -rw-r--r-- | toolsrc/include/vcpkg_paths.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/main.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_paths.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h index c444d695e..d13c73b0b 100644 --- a/toolsrc/include/vcpkg_paths.h +++ b/toolsrc/include/vcpkg_paths.h @@ -13,7 +13,7 @@ namespace vcpkg fs::path package_dir(const package_spec& spec) const; fs::path port_dir(const package_spec& spec) const; - bool validate_triplet(const triplet& t) const; + bool is_valid_triplet(const triplet& t) const; std::tr2::sys::path root; std::tr2::sys::path packages; diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp index c7162dce0..a317330ff 100644 --- a/toolsrc/src/main.cpp +++ b/toolsrc/src/main.cpp @@ -87,7 +87,7 @@ static void inner(const vcpkg_cmd_arguments& args) } } - if (!paths.validate_triplet(default_target_triplet)) + if (!paths.is_valid_triplet(default_target_triplet)) { System::println(System::color::error, "Error: invalid triplet: %s", default_target_triplet.value); TrackProperty("error", "invalid triplet: " + default_target_triplet.value); diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp index b3bbcbee1..463f62c80 100644 --- a/toolsrc/src/vcpkg_paths.cpp +++ b/toolsrc/src/vcpkg_paths.cpp @@ -57,7 +57,7 @@ namespace vcpkg return this->ports / spec.name; } - bool vcpkg_paths::validate_triplet(const triplet& t) const + bool vcpkg_paths::is_valid_triplet(const triplet& t) const { auto it = fs::directory_iterator(this->triplets); for (; it != fs::directory_iterator(); ++it) |