aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-10-04 14:48:39 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-10-04 14:48:39 -0700
commit7d13495cf90af06bad4351a91a5d7cb868abd2de (patch)
tree7b18a0f83b55dbc03375f54df41f4f61230cdffc /toolsrc/src
parentbf323e8cc6f3edd245e3f5661cab6c8b7f335da9 (diff)
downloadvcpkg-7d13495cf90af06bad4351a91a5d7cb868abd2de.tar.gz
vcpkg-7d13495cf90af06bad4351a91a5d7cb868abd2de.zip
All-CAPS for enum members
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/package_spec.cpp4
-rw-r--r--toolsrc/src/package_spec_parse_result.cpp6
-rw-r--r--toolsrc/src/test.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/src/package_spec.cpp b/toolsrc/src/package_spec.cpp
index a578787c9..b9f6f54fe 100644
--- a/toolsrc/src/package_spec.cpp
+++ b/toolsrc/src/package_spec.cpp
@@ -19,7 +19,7 @@ namespace vcpkg
auto pos2 = spec_as_string.find(':', pos + 1);
if (pos2 != std::string::npos)
{
- return std::error_code(package_spec_parse_result::too_many_colons);
+ return std::error_code(package_spec_parse_result::TOO_MANY_COLONS);
}
const std::string name = spec_as_string.substr(0, pos);
@@ -31,7 +31,7 @@ namespace vcpkg
{
if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end())
{
- return std::error_code(package_spec_parse_result::invalid_characters);
+ return std::error_code(package_spec_parse_result::INVALID_CHARACTERS);
}
package_spec p;
diff --git a/toolsrc/src/package_spec_parse_result.cpp b/toolsrc/src/package_spec_parse_result.cpp
index 6c6c28e21..d7600ad5b 100644
--- a/toolsrc/src/package_spec_parse_result.cpp
+++ b/toolsrc/src/package_spec_parse_result.cpp
@@ -13,11 +13,11 @@ namespace vcpkg
{
switch (static_cast<package_spec_parse_result>(ev))
{
- case package_spec_parse_result::success:
+ case package_spec_parse_result::SUCCESS:
return "OK";
- case package_spec_parse_result::too_many_colons:
+ case package_spec_parse_result::TOO_MANY_COLONS:
return "Too many colons";
- case package_spec_parse_result::invalid_characters:
+ case package_spec_parse_result::INVALID_CHARACTERS:
return "Contains invalid characters. Only alphanumeric ASCII characters and dashes are allowed";
default:
Checks::unreachable();
diff --git a/toolsrc/src/test.cpp b/toolsrc/src/test.cpp
index ba35391aa..476efb233 100644
--- a/toolsrc/src/test.cpp
+++ b/toolsrc/src/test.cpp
@@ -309,7 +309,7 @@ namespace UnitTest1
TEST_METHOD(package_spec_parse)
{
vcpkg::expected<vcpkg::package_spec> spec = vcpkg::package_spec::from_string("zlib", vcpkg::triplet::X86_WINDOWS);
- Assert::AreEqual(vcpkg::package_spec_parse_result::success, vcpkg::to_package_spec_parse_result(spec.error_code()));
+ Assert::AreEqual(vcpkg::package_spec_parse_result::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
Assert::AreEqual("zlib", spec.get()->name().c_str());
Assert::AreEqual(vcpkg::triplet::X86_WINDOWS.canonical_name(), spec.get()->target_triplet().canonical_name());
}
@@ -317,7 +317,7 @@ namespace UnitTest1
TEST_METHOD(package_spec_parse_with_arch)
{
vcpkg::expected<vcpkg::package_spec> spec = vcpkg::package_spec::from_string("zlib:x64-uwp", vcpkg::triplet::X86_WINDOWS);
- Assert::AreEqual(vcpkg::package_spec_parse_result::success, vcpkg::to_package_spec_parse_result(spec.error_code()));
+ Assert::AreEqual(vcpkg::package_spec_parse_result::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
Assert::AreEqual("zlib", spec.get()->name().c_str());
Assert::AreEqual(vcpkg::triplet::X64_UWP.canonical_name(), spec.get()->target_triplet().canonical_name());
}
@@ -325,7 +325,7 @@ namespace UnitTest1
TEST_METHOD(package_spec_parse_with_multiple_colon)
{
auto ec = vcpkg::package_spec::from_string("zlib:x86-uwp:", vcpkg::triplet::X86_WINDOWS).error_code();
- Assert::AreEqual(vcpkg::package_spec_parse_result::too_many_colons, vcpkg::to_package_spec_parse_result(ec));
+ Assert::AreEqual(vcpkg::package_spec_parse_result::TOO_MANY_COLONS, vcpkg::to_package_spec_parse_result(ec));
}
TEST_METHOD(utf8_to_utf16)