aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_import.cpp
diff options
context:
space:
mode:
authorsdcb <sdflysha@qq.com>2017-01-14 10:55:19 +0800
committersdcb <sdflysha@qq.com>2017-01-14 10:55:19 +0800
commitbeec44ae8d09b31a6c137bd580bd05111adc3077 (patch)
treee444c555f550471800becec72001ce4428b95a89 /toolsrc/src/commands_import.cpp
parentc104c8966f7bf2fa6576d25cc3631894008c94e1 (diff)
parent1e4e45ffcee2774a6cbe87527c140fa2107bd29d (diff)
downloadvcpkg-beec44ae8d09b31a6c137bd580bd05111adc3077.tar.gz
vcpkg-beec44ae8d09b31a6c137bd580bd05111adc3077.zip
Merge remote-tracking branch 'refs/remotes/upstream/master'
Diffstat (limited to 'toolsrc/src/commands_import.cpp')
-rw-r--r--toolsrc/src/commands_import.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/commands_import.cpp b/toolsrc/src/commands_import.cpp
index 3832f0e7b..14e83e75f 100644
--- a/toolsrc/src/commands_import.cpp
+++ b/toolsrc/src/commands_import.cpp
@@ -4,7 +4,7 @@
#include "vcpkg_Files.h"
#include <fstream>
-namespace vcpkg
+namespace vcpkg::Commands::Import
{
struct Binaries
{
@@ -75,9 +75,9 @@ namespace vcpkg
std::ofstream(control_file_path) << control_file_data;
}
- void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
+ void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
{
- static const std::string example = create_example_string(R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)");
+ static const std::string example = Commands::Help::create_example_string(R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)");
args.check_exact_arg_count(3, example);
const fs::path control_file_path(args.command_arguments[0]);