aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-01-31 12:59:20 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-01-31 12:59:20 -0800
commit2a83c5eda6288cba46cb723996f95b0f6b21e61f (patch)
tree6266cdd5228372d695f8063f9da424a9de43dacd
parentc6ab2a962600b5c1c506b7dbf70d5719c4c8aaf1 (diff)
downloadvcpkg-2a83c5eda6288cba46cb723996f95b0f6b21e61f.tar.gz
vcpkg-2a83c5eda6288cba46cb723996f95b0f6b21e61f.zip
[opt_bool] Make members ALL_CAPS
-rw-r--r--toolsrc/include/opt_bool.h6
-rw-r--r--toolsrc/include/vcpkg_cmd_arguments.h6
-rw-r--r--toolsrc/src/vcpkg.cpp12
-rw-r--r--toolsrc/src/vcpkg_cmd_arguments.cpp12
4 files changed, 18 insertions, 18 deletions
diff --git a/toolsrc/include/opt_bool.h b/toolsrc/include/opt_bool.h
index 3856366c8..42133fb7a 100644
--- a/toolsrc/include/opt_bool.h
+++ b/toolsrc/include/opt_bool.h
@@ -4,8 +4,8 @@ namespace vcpkg
{
enum class opt_bool
{
- unspecified,
- enabled,
- disabled
+ UNSPECIFIED,
+ ENABLED,
+ DISABLED
};
}
diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h
index 8ace98586..79e12841d 100644
--- a/toolsrc/include/vcpkg_cmd_arguments.h
+++ b/toolsrc/include/vcpkg_cmd_arguments.h
@@ -14,9 +14,9 @@ namespace vcpkg
std::unique_ptr<std::string> vcpkg_root_dir;
std::unique_ptr<std::string> target_triplet;
- opt_bool debug = opt_bool::unspecified;
- opt_bool sendmetrics = opt_bool::unspecified;
- opt_bool printmetrics = opt_bool::unspecified;
+ opt_bool debug = opt_bool::UNSPECIFIED;
+ opt_bool sendmetrics = opt_bool::UNSPECIFIED;
+ opt_bool printmetrics = opt_bool::UNSPECIFIED;
std::string command;
std::vector<std::string> command_arguments;
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index b78319167..36bd0a40a 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -202,14 +202,14 @@ int wmain(const int argc, const wchar_t* const* const argv)
const vcpkg_cmd_arguments args = vcpkg_cmd_arguments::create_from_command_line(argc, argv);
- if (args.printmetrics != opt_bool::unspecified)
- SetPrintMetrics(args.printmetrics == opt_bool::enabled);
- if (args.sendmetrics != opt_bool::unspecified)
- SetSendMetrics(args.sendmetrics == opt_bool::enabled);
+ if (args.printmetrics != opt_bool::UNSPECIFIED)
+ SetPrintMetrics(args.printmetrics == opt_bool::ENABLED);
+ if (args.sendmetrics != opt_bool::UNSPECIFIED)
+ SetSendMetrics(args.sendmetrics == opt_bool::ENABLED);
- if (args.debug != opt_bool::unspecified)
+ if (args.debug != opt_bool::UNSPECIFIED)
{
- g_debugging = (args.debug == opt_bool::enabled);
+ g_debugging = (args.debug == opt_bool::ENABLED);
}
if (g_debugging)
diff --git a/toolsrc/src/vcpkg_cmd_arguments.cpp b/toolsrc/src/vcpkg_cmd_arguments.cpp
index 4a06128a4..e0d307077 100644
--- a/toolsrc/src/vcpkg_cmd_arguments.cpp
+++ b/toolsrc/src/vcpkg_cmd_arguments.cpp
@@ -36,7 +36,7 @@ namespace vcpkg
const std::string& option_name,
opt_bool& option_field)
{
- if (option_field != opt_bool::unspecified && option_field != new_setting)
+ if (option_field != opt_bool::UNSPECIFIED && option_field != new_setting)
{
System::println(System::color::error, "Error: conflicting values specified for --%s", option_name);
TrackProperty("error", "error conflicting switches");
@@ -94,27 +94,27 @@ namespace vcpkg
}
if (arg == "--debug")
{
- parse_switch(opt_bool::enabled, "debug", args.debug);
+ parse_switch(opt_bool::ENABLED, "debug", args.debug);
continue;
}
if (arg == "--sendmetrics")
{
- parse_switch(opt_bool::enabled, "sendmetrics", args.sendmetrics);
+ parse_switch(opt_bool::ENABLED, "sendmetrics", args.sendmetrics);
continue;
}
if (arg == "--printmetrics")
{
- parse_switch(opt_bool::enabled, "printmetrics", args.printmetrics);
+ parse_switch(opt_bool::ENABLED, "printmetrics", args.printmetrics);
continue;
}
if (arg == "--no-sendmetrics")
{
- parse_switch(opt_bool::disabled, "sendmetrics", args.sendmetrics);
+ parse_switch(opt_bool::DISABLED, "sendmetrics", args.sendmetrics);
continue;
}
if (arg == "--no-printmetrics")
{
- parse_switch(opt_bool::disabled, "printmetrics", args.printmetrics);
+ parse_switch(opt_bool::DISABLED, "printmetrics", args.printmetrics);
continue;
}