From fdda06e83d7da985bf78ea81e2da450052798204 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Apr 2017 14:52:06 -0700 Subject: [PATCH] ConfigurationType to UpperCamelCase --- toolsrc/include/PostBuildLint_BuildType.h | 8 ++++---- .../include/PostBuildLint_ConfigurationType.h | 20 +++++++++---------- toolsrc/src/PostBuildLint_BuildType.cpp | 4 ++-- .../src/PostBuildLint_ConfigurationType.cpp | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/toolsrc/include/PostBuildLint_BuildType.h b/toolsrc/include/PostBuildLint_BuildType.h index a8fd90740..1df260101 100644 --- a/toolsrc/include/PostBuildLint_BuildType.h +++ b/toolsrc/include/PostBuildLint_BuildType.h @@ -18,19 +18,19 @@ namespace vcpkg::PostBuildLint::BuildType { Type() = delete; - constexpr explicit Type(const BackingEnum backing_enum, const ConfigurationType::type config, const LinkageType::type linkage) : + constexpr explicit Type(const BackingEnum backing_enum, const ConfigurationType::Type config, const LinkageType::type linkage) : backing_enum(backing_enum), m_config(config), m_linkage(linkage) { } constexpr operator BackingEnum() const { return backing_enum; } - const ConfigurationType::type& config() const; + const ConfigurationType::Type& config() const; const LinkageType::type& linkage() const; const std::regex& crt_regex() const; const std::string& toString() const; private: BackingEnum backing_enum; - ConfigurationType::type m_config; + ConfigurationType::Type m_config; LinkageType::type m_linkage; }; @@ -43,5 +43,5 @@ namespace vcpkg::PostBuildLint::BuildType static constexpr std::array values = { DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC }; - Type value_of(const ConfigurationType::type& config, const LinkageType::type& linkage); + Type value_of(const ConfigurationType::Type& config, const LinkageType::type& linkage); } diff --git a/toolsrc/include/PostBuildLint_ConfigurationType.h b/toolsrc/include/PostBuildLint_ConfigurationType.h index 7245d2932..0f29110a7 100644 --- a/toolsrc/include/PostBuildLint_ConfigurationType.h +++ b/toolsrc/include/PostBuildLint_ConfigurationType.h @@ -4,30 +4,30 @@ namespace vcpkg::PostBuildLint::ConfigurationType { - enum class backing_enum_t + enum class BackingEnum { NULLVALUE = 0, DEBUG = 1, RELEASE = 2 }; - struct type + struct Type { - constexpr type() : backing_enum(backing_enum_t::NULLVALUE) {} - constexpr explicit type(backing_enum_t backing_enum) : backing_enum(backing_enum) { } - constexpr operator backing_enum_t() const { return backing_enum; } + constexpr Type() : backing_enum(BackingEnum::NULLVALUE) {} + constexpr explicit Type(BackingEnum backing_enum) : backing_enum(backing_enum) { } + constexpr operator BackingEnum() const { return backing_enum; } const std::string& toString() const; private: - backing_enum_t backing_enum; + BackingEnum backing_enum; }; static const std::string ENUM_NAME = "vcpkg::PostBuildLint::ConfigurationType"; - static constexpr type NULLVALUE(backing_enum_t::NULLVALUE); - static constexpr type DEBUG(backing_enum_t::DEBUG); - static constexpr type RELEASE(backing_enum_t::RELEASE); + static constexpr Type NULLVALUE(BackingEnum::NULLVALUE); + static constexpr Type DEBUG(BackingEnum::DEBUG); + static constexpr Type RELEASE(BackingEnum::RELEASE); - static constexpr std::array values = { DEBUG, RELEASE }; + static constexpr std::array values = { DEBUG, RELEASE }; } diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp index 915d5d670..43a9f4416 100644 --- a/toolsrc/src/PostBuildLint_BuildType.cpp +++ b/toolsrc/src/PostBuildLint_BuildType.cpp @@ -4,7 +4,7 @@ namespace vcpkg::PostBuildLint::BuildType { - Type value_of(const ConfigurationType::type& config, const LinkageType::type& linkage) + Type value_of(const ConfigurationType::Type& config, const LinkageType::type& linkage) { if (config == ConfigurationType::DEBUG && linkage == LinkageType::STATIC) { @@ -29,7 +29,7 @@ namespace vcpkg::PostBuildLint::BuildType Checks::unreachable(VCPKG_LINE_INFO); } - const ConfigurationType::type& Type::config() const + const ConfigurationType::Type& Type::config() const { return this->m_config; } diff --git a/toolsrc/src/PostBuildLint_ConfigurationType.cpp b/toolsrc/src/PostBuildLint_ConfigurationType.cpp index 00cc7be63..7edd927a3 100644 --- a/toolsrc/src/PostBuildLint_ConfigurationType.cpp +++ b/toolsrc/src/PostBuildLint_ConfigurationType.cpp @@ -10,7 +10,7 @@ namespace vcpkg::PostBuildLint::ConfigurationType static const std::string NAME_DEBUG = "Debug"; static const std::string NAME_RELEASE = "Release"; - const std::string& type::toString() const + const std::string& Type::toString() const { switch (this->backing_enum) {