diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-25 17:39:59 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-25 17:56:19 -0700 |
| commit | ef0bdb00e4f671ea3c5d1bf096d230b57b526d96 (patch) | |
| tree | 9431d190cd14747058b2b24897301e6124dc0ca2 /toolsrc/include/PostBuildLint_BuildType.h | |
| parent | d3d00b33dd524815b47f1bc6e6f8080dc7054d29 (diff) | |
| download | vcpkg-ef0bdb00e4f671ea3c5d1bf096d230b57b526d96.tar.gz vcpkg-ef0bdb00e4f671ea3c5d1bf096d230b57b526d96.zip | |
Rework ConfigurationType enum
Diffstat (limited to 'toolsrc/include/PostBuildLint_BuildType.h')
| -rw-r--r-- | toolsrc/include/PostBuildLint_BuildType.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildType.h b/toolsrc/include/PostBuildLint_BuildType.h index a086c8f03..55a5878a9 100644 --- a/toolsrc/include/PostBuildLint_BuildType.h +++ b/toolsrc/include/PostBuildLint_BuildType.h @@ -16,11 +16,11 @@ namespace vcpkg::PostBuildLint RELEASE_DYNAMIC }; - static BuildType value_of(const ConfigurationType::Type& config, const LinkageType& linkage); + static BuildType value_of(const ConfigurationType& config, const LinkageType& linkage); BuildType() = delete; - constexpr explicit BuildType(const BackingEnum backing_enum, const ConfigurationType::Type config, const LinkageType linkage) + constexpr explicit BuildType(const BackingEnum backing_enum, const ConfigurationType config, const LinkageType linkage) : backing_enum(backing_enum) , m_config(config) @@ -28,14 +28,14 @@ namespace vcpkg::PostBuildLint constexpr operator BackingEnum() const { return backing_enum; } - const ConfigurationType::Type& config() const; + const ConfigurationType& config() const; const LinkageType& linkage() const; const std::regex& crt_regex() const; const std::string& to_string() const; private: BackingEnum backing_enum; - ConfigurationType::Type m_config; + ConfigurationType m_config; LinkageType m_linkage; }; @@ -43,10 +43,10 @@ namespace vcpkg::PostBuildLint { static constexpr const char* ENUM_NAME = "vcpkg::PostBuildLint::BuildType"; - static constexpr BuildType DEBUG_STATIC = BuildType(BuildType::BackingEnum::DEBUG_STATIC, ConfigurationType::DEBUG, LinkageTypeC::STATIC); - static constexpr BuildType DEBUG_DYNAMIC = BuildType(BuildType::BackingEnum::DEBUG_DYNAMIC, ConfigurationType::DEBUG, LinkageTypeC::DYNAMIC); - static constexpr BuildType RELEASE_STATIC = BuildType(BuildType::BackingEnum::RELEASE_STATIC, ConfigurationType::RELEASE, LinkageTypeC::STATIC); - static constexpr BuildType RELEASE_DYNAMIC = BuildType(BuildType::BackingEnum::RELEASE_DYNAMIC, ConfigurationType::RELEASE, LinkageTypeC::DYNAMIC); + static constexpr BuildType DEBUG_STATIC = BuildType(BuildType::BackingEnum::DEBUG_STATIC, ConfigurationTypeC::DEBUG, LinkageTypeC::STATIC); + static constexpr BuildType DEBUG_DYNAMIC = BuildType(BuildType::BackingEnum::DEBUG_DYNAMIC, ConfigurationTypeC::DEBUG, LinkageTypeC::DYNAMIC); + static constexpr BuildType RELEASE_STATIC = BuildType(BuildType::BackingEnum::RELEASE_STATIC, ConfigurationTypeC::RELEASE, LinkageTypeC::STATIC); + static constexpr BuildType RELEASE_DYNAMIC = BuildType(BuildType::BackingEnum::RELEASE_DYNAMIC, ConfigurationTypeC::RELEASE, LinkageTypeC::DYNAMIC); static constexpr std::array<BuildType, 4> VALUES = { DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC }; }} |