diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-03 16:03:04 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-04 16:44:43 -0700 |
| commit | 0621449f1807aacebb6ad10f42877322abb48d9d (patch) | |
| tree | e3b1e5636ca1b26c632fd07b9d256f23a04b5fd0 | |
| parent | e051edfa10a686490168f0e888297afb22a4b905 (diff) | |
| download | vcpkg-0621449f1807aacebb6ad10f42877322abb48d9d.tar.gz vcpkg-0621449f1807aacebb6ad10f42877322abb48d9d.zip | |
command_type_x -> CommandTypeX
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 12 | ||||
| -rw-r--r-- | toolsrc/src/commands_available_commands.cpp | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index b7e981b41..9ba423a08 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -8,9 +8,9 @@ namespace vcpkg::Commands { - using command_type_a = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); - using command_type_b = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths); - using command_type_c = void(*)(const VcpkgCmdArguments& args); + using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + using CommandTypeB = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths); + using CommandTypeC = void(*)(const VcpkgCmdArguments& args); namespace Build { @@ -160,9 +160,9 @@ namespace vcpkg::Commands T function; }; - const std::vector<package_name_and_function<command_type_a>>& get_available_commands_type_a(); - const std::vector<package_name_and_function<command_type_b>>& get_available_commands_type_b(); - const std::vector<package_name_and_function<command_type_c>>& get_available_commands_type_c(); + const std::vector<package_name_and_function<CommandTypeA>>& get_available_commands_type_a(); + const std::vector<package_name_and_function<CommandTypeB>>& get_available_commands_type_b(); + const std::vector<package_name_and_function<CommandTypeC>>& get_available_commands_type_c(); template <typename T> T find(const std::string& command_name, const std::vector<package_name_and_function<T>> available_commands) diff --git a/toolsrc/src/commands_available_commands.cpp b/toolsrc/src/commands_available_commands.cpp index 70e528704..45ece8ed9 100644 --- a/toolsrc/src/commands_available_commands.cpp +++ b/toolsrc/src/commands_available_commands.cpp @@ -3,9 +3,9 @@ namespace vcpkg::Commands { - const std::vector<package_name_and_function<command_type_a>>& get_available_commands_type_a() + const std::vector<package_name_and_function<CommandTypeA>>& get_available_commands_type_a() { - static std::vector<package_name_and_function<command_type_a>> t = { + static std::vector<package_name_and_function<CommandTypeA>> t = { {"install", &Install::perform_and_exit}, { "ci", &CI::perform_and_exit }, {"remove", &Remove::perform_and_exit}, @@ -16,9 +16,9 @@ namespace vcpkg::Commands return t; } - const std::vector<package_name_and_function<command_type_b>>& get_available_commands_type_b() + const std::vector<package_name_and_function<CommandTypeB>>& get_available_commands_type_b() { - static std::vector<package_name_and_function<command_type_b>> t = { + static std::vector<package_name_and_function<CommandTypeB>> t = { {"/?", &Help::perform_and_exit}, {"help", &Help::perform_and_exit}, {"search", &Search::perform_and_exit}, @@ -35,9 +35,9 @@ namespace vcpkg::Commands return t; } - const std::vector<package_name_and_function<command_type_c>>& get_available_commands_type_c() + const std::vector<package_name_and_function<CommandTypeC>>& get_available_commands_type_c() { - static std::vector<package_name_and_function<command_type_c>> t = { + static std::vector<package_name_and_function<CommandTypeC>> t = { {"version", &Version::perform_and_exit}, {"contact", &Contact::perform_and_exit}, {"hash", &Hash::perform_and_exit}, |