aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-25 17:16:09 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-25 17:56:18 -0700
commit1ac0f768b7209b33e3f33730649a9f4e33dec37a (patch)
tree860f287a216e6e31a5dcffbcaf359020699db136
parent003693c5ac9b6dd4484341cb8b09c22243cef954 (diff)
downloadvcpkg-1ac0f768b7209b33e3f33730649a9f4e33dec37a.tar.gz
vcpkg-1ac0f768b7209b33e3f33730649a9f4e33dec37a.zip
ENUM_NAME should be in the enum namespace
-rw-r--r--toolsrc/include/PostBuildLint_BuildPolicies.h4
-rw-r--r--toolsrc/src/PostBuildLint_BuildPolicies.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
index c73601554..ecada374a 100644
--- a/toolsrc/include/PostBuildLint_BuildPolicies.h
+++ b/toolsrc/include/PostBuildLint_BuildPolicies.h
@@ -28,10 +28,10 @@ namespace vcpkg::PostBuildLint
BackingEnum backing_enum;
};
- static const std::string ENUM_NAME = "vcpkg::PostBuildLint::BuildPolicies";
-
namespace BuildPoliciesC
{
+ static constexpr const char* ENUM_NAME = "vcpkg::PostBuildLint::BuildPolicies";
+
static constexpr BuildPolicies NULLVALUE(BuildPolicies::BackingEnum::NULLVALUE);
static constexpr BuildPolicies EMPTY_PACKAGE(BuildPolicies::BackingEnum::EMPTY_PACKAGE);
static constexpr BuildPolicies DLLS_WITHOUT_LIBS(BuildPolicies::BackingEnum::DLLS_WITHOUT_LIBS);
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index 1048b59bd..c09a06627 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -5,7 +5,7 @@
namespace vcpkg::PostBuildLint
{
- static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string(ENUM_NAME);
+ static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string(BuildPoliciesC::ENUM_NAME);
static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
@@ -74,7 +74,7 @@ namespace vcpkg::PostBuildLint
case BuildPoliciesC::EMPTY_INCLUDE_FOLDER:
return CMAKE_VARIABLE_EMPTY_INCLUDE_FOLDER;
case BuildPoliciesC::NULLVALUE:
- Enums::nullvalue_used(VCPKG_LINE_INFO, ENUM_NAME);
+ Enums::nullvalue_used(VCPKG_LINE_INFO, BuildPoliciesC::ENUM_NAME);
default:
Checks::unreachable(VCPKG_LINE_INFO);
}