From 1ac0f768b7209b33e3f33730649a9f4e33dec37a Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 25 Apr 2017 17:16:09 -0700 Subject: ENUM_NAME should be in the enum namespace --- toolsrc/include/PostBuildLint_BuildPolicies.h | 4 ++-- toolsrc/src/PostBuildLint_BuildPolicies.cpp | 4 ++-- 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); } -- cgit v1.2.3