Reorganize commands, each in its own namespace

Additionally, functions related to a command can now live
in the same namespace

1 files changed, 19 insertions, 19 deletions

diff --git a/toolsrc/src/commands_available_commands.cpp b/toolsrc/src/commands_available_commands.cpp
index f78416aed..48239587d 100644
--- a/toolsrc/src/commands_available_commands.cpp
+++ b/toolsrc/src/commands_available_commands.cpp
@@ -5,10 +5,10 @@ namespace vcpkg::Commands
     const std::vector<package_name_and_function<command_type_a>>& get_available_commands_type_a()
     {
         static std::vector<package_name_and_function<command_type_a>> t = {
-            {"install", install_command},
-            {"remove", remove_command},
-            {"build", build_command},
-            {"build_external", build_external_command}
+            {"install", &Install::perform_and_exit},
+            {"remove", &Remove::perform_and_exit},
+            {"build", &Build::perform_and_exit},
+            {"build_external", &BuildExternal::perform_and_exit}
         };
         return t;
     }
@@ -16,18 +16,18 @@ namespace vcpkg::Commands
     const std::vector<package_name_and_function<command_type_b>>& get_available_commands_type_b()
     {
         static std::vector<package_name_and_function<command_type_b>> t = {
-            {"/?", help_command},
-            {"help", help_command},
-            {"search", search_command},
-            {"list", list_command},
-            {"integrate", integrate_command},
-            {"owns", owns_command},
-            {"update", update_command},
-            {"edit", edit_command},
-            {"create", create_command},
-            {"import", import_command},
-            {"cache", cache_command},
-            {"portsdiff", portsdiff_command}
+            {"/?", &Help::perform_and_exit},
+            {"help", &Help::perform_and_exit},
+            {"search", &Search::perform_and_exit},
+            {"list", &List::perform_and_exit},
+            {"integrate", &Integrate::perform_and_exit},
+            {"owns", &Owns::perform_and_exit},
+            {"update", &Update::perform_and_exit},
+            {"edit", &Edit::perform_and_exit},
+            {"create", &Create::perform_and_exit},
+            {"import", &Import::perform_and_exit},
+            {"cache", &Cache::perform_and_exit},
+            {"portsdiff", &PortsDiff::perform_and_exit}
         };
         return t;
     }
@@ -35,9 +35,9 @@ namespace vcpkg::Commands
     const std::vector<package_name_and_function<command_type_c>>& get_available_commands_type_c()
     {
         static std::vector<package_name_and_function<command_type_c>> t = {
-            {"version", &version_command},
-            {"contact", &contact_command},
-            {"hash", &hash_command},
+            {"version", &Version::perform_and_exit},
+            {"contact", &Contact::perform_and_exit},
+            {"hash", &Hash::perform_and_exit},
         };
         return t;
     }