diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 17:02:39 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 17:02:39 -0700 |
| commit | 188eac680ba930c51943d4af34de58bbd325dcb1 (patch) | |
| tree | 265aefd33d03cdc109fab1a015c0d885afb41b9a | |
| parent | 51bc83c70e915892a658795f51bb3bb10360ee8d (diff) | |
| download | vcpkg-188eac680ba930c51943d4af34de58bbd325dcb1.tar.gz vcpkg-188eac680ba930c51943d4af34de58bbd325dcb1.zip | |
Rename check_all_triplets() to check_triplets()
| -rw-r--r-- | toolsrc/include/vcpkg_Input.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_remove.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Input.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index 1aa5bcb99..bbf3adfbf 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -11,5 +11,5 @@ namespace vcpkg {namespace Input void check_triplet(const triplet& t, const vcpkg_paths& paths); - void check_all_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths); + void check_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths); }} diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 8e66f9548..d6590fd0d 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -71,7 +71,7 @@ namespace vcpkg StatusParagraphs status_db = database_load_check(paths); std::vector<package_spec> specs = Input::check_and_get_package_specs(args.command_arguments, default_target_triplet, example.c_str()); - Input::check_all_triplets(specs, paths); + Input::check_triplets(specs, paths); std::vector<package_spec> install_plan = Dependencies::create_dependency_ordered_install_plan(paths, specs, status_db); Checks::check_exit(!install_plan.empty(), "Install plan cannot be empty"); std::string specs_string = to_string(install_plan[0]); diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index c458125dd..5bb9ecc96 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -30,7 +30,7 @@ namespace vcpkg auto status_db = database_load_check(paths); std::vector<package_spec> specs = Input::check_and_get_package_specs(args.command_arguments, default_target_triplet, example.c_str()); - Input::check_all_triplets(specs, paths); + Input::check_triplets(specs, paths); bool alsoRemoveFolderFromPackages = options.find(OPTION_PURGE) != options.end(); for (const package_spec& spec : specs) diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp index c8da089b8..269de13b3 100644 --- a/toolsrc/src/vcpkg_Input.cpp +++ b/toolsrc/src/vcpkg_Input.cpp @@ -40,7 +40,7 @@ namespace vcpkg {namespace Input } } - void check_all_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths) + void check_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths) { for (const package_spec& spec : triplets) { |