diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-25 17:05:48 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-25 17:56:18 -0700 |
| commit | 09b9340515b98b81d751b5be54376893a22dcbf0 (patch) | |
| tree | ee4e1a441f70a27748a72c27a559db36db2dd839 | |
| parent | 1aef09ba58c725b1b0fe4e81efa5daa954cb9323 (diff) | |
| download | vcpkg-09b9340515b98b81d751b5be54376893a22dcbf0.tar.gz vcpkg-09b9340515b98b81d751b5be54376893a22dcbf0.zip | |
Make constexprs static
| -rw-r--r-- | toolsrc/include/OptBool.h | 6 | ||||
| -rw-r--r-- | 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 b6b26833b..7bbc12daf 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<class T> diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h index 7b10781ee..c73601554 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<BuildPolicies, 4> VALUES = { EMPTY_PACKAGE,DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER }; + static constexpr std::array<BuildPolicies, 4> VALUES = { EMPTY_PACKAGE,DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER }; }} |
