From 09b9340515b98b81d751b5be54376893a22dcbf0 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 25 Apr 2017 17:05:48 -0700 Subject: [PATCH] Make constexprs static --- toolsrc/include/OptBool.h | 6 +++--- toolsrc/include/PostBuildLint_BuildPolicies.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolsrc/include/OptBool.h b/toolsrc/include/OptBool.h index b6b26833b6..7bbc12dafd 100644 --- a/toolsrc/include/OptBool.h +++ b/toolsrc/include/OptBool.h @@ -29,9 +29,9 @@ namespace vcpkg namespace OptBoolC { - constexpr OptBool UNSPECIFIED(OptBool::BackingEnum::UNSPECIFIED); - constexpr OptBool ENABLED(OptBool::BackingEnum::ENABLED); - constexpr OptBool DISABLED(OptBool::BackingEnum::DISABLED); + static constexpr OptBool UNSPECIFIED(OptBool::BackingEnum::UNSPECIFIED); + static constexpr OptBool ENABLED(OptBool::BackingEnum::ENABLED); + static constexpr OptBool DISABLED(OptBool::BackingEnum::DISABLED); } template diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h index 7b10781eee..c736015545 100644 --- a/toolsrc/include/PostBuildLint_BuildPolicies.h +++ b/toolsrc/include/PostBuildLint_BuildPolicies.h @@ -32,11 +32,11 @@ namespace vcpkg::PostBuildLint namespace BuildPoliciesC { - constexpr BuildPolicies NULLVALUE(BuildPolicies::BackingEnum::NULLVALUE); - constexpr BuildPolicies EMPTY_PACKAGE(BuildPolicies::BackingEnum::EMPTY_PACKAGE); - constexpr BuildPolicies DLLS_WITHOUT_LIBS(BuildPolicies::BackingEnum::DLLS_WITHOUT_LIBS); - constexpr BuildPolicies ONLY_RELEASE_CRT(BuildPolicies::BackingEnum::ONLY_RELEASE_CRT); - constexpr BuildPolicies EMPTY_INCLUDE_FOLDER(BuildPolicies::BackingEnum::EMPTY_INCLUDE_FOLDER); + 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); + static constexpr BuildPolicies ONLY_RELEASE_CRT(BuildPolicies::BackingEnum::ONLY_RELEASE_CRT); + static constexpr BuildPolicies EMPTY_INCLUDE_FOLDER(BuildPolicies::BackingEnum::EMPTY_INCLUDE_FOLDER); - constexpr std::array VALUES = { EMPTY_PACKAGE,DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER }; + static constexpr std::array VALUES = { EMPTY_PACKAGE,DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER }; }}