Rework ConfigurationType enum

3 files changed, 14 insertions, 14 deletions

diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index b11793f57..f1e1dcd17 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -723,9 +723,9 @@ namespace vcpkg::PostBuildLint
 
                     if (!contains_and_enabled(build_info.policies, BuildPoliciesC::ONLY_RELEASE_CRT))
                     {
-                        error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, build_info.crt_linkage), debug_libs, toolset.dumpbin);
+                        error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationTypeC::DEBUG, build_info.crt_linkage), debug_libs, toolset.dumpbin);
                     }
-                    error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::RELEASE, build_info.crt_linkage), release_libs, toolset.dumpbin);
+                    error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationTypeC::RELEASE, build_info.crt_linkage), release_libs, toolset.dumpbin);
                     break;
                 }
             case LinkageType::BackingEnum::NULLVALUE:
diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp
index 160d371f7..651e95836 100644
--- a/toolsrc/src/PostBuildLint_BuildType.cpp
+++ b/toolsrc/src/PostBuildLint_BuildType.cpp
@@ -4,24 +4,24 @@
 
 namespace vcpkg::PostBuildLint
 {
-    BuildType BuildType::value_of(const ConfigurationType::Type& config, const LinkageType& linkage)
+    BuildType BuildType::value_of(const ConfigurationType& config, const LinkageType& linkage)
     {
-        if (config == ConfigurationType::DEBUG && linkage == LinkageTypeC::STATIC)
+        if (config == ConfigurationTypeC::DEBUG && linkage == LinkageTypeC::STATIC)
         {
             return BuildTypeC::DEBUG_STATIC;
         }
 
-        if (config == ConfigurationType::DEBUG && linkage == LinkageTypeC::DYNAMIC)
+        if (config == ConfigurationTypeC::DEBUG && linkage == LinkageTypeC::DYNAMIC)
         {
             return BuildTypeC::DEBUG_DYNAMIC;
         }
 
-        if (config == ConfigurationType::RELEASE && linkage == LinkageTypeC::STATIC)
+        if (config == ConfigurationTypeC::RELEASE && linkage == LinkageTypeC::STATIC)
         {
             return BuildTypeC::RELEASE_STATIC;
         }
 
-        if (config == ConfigurationType::RELEASE && linkage == LinkageTypeC::DYNAMIC)
+        if (config == ConfigurationTypeC::RELEASE && linkage == LinkageTypeC::DYNAMIC)
         {
             return BuildTypeC::RELEASE_DYNAMIC;
         }
@@ -29,7 +29,7 @@ namespace vcpkg::PostBuildLint
         Checks::unreachable(VCPKG_LINE_INFO);
     }
 
-    const ConfigurationType::Type& BuildType::config() const
+    const ConfigurationType& BuildType::config() const
     {
         return this->m_config;
     }
diff --git a/toolsrc/src/PostBuildLint_ConfigurationType.cpp b/toolsrc/src/PostBuildLint_ConfigurationType.cpp
index e61415499..1acfb3cf9 100644
--- a/toolsrc/src/PostBuildLint_ConfigurationType.cpp
+++ b/toolsrc/src/PostBuildLint_ConfigurationType.cpp
@@ -3,22 +3,22 @@
 #include "vcpkg_Enums.h"
 #include "PackageSpec.h"
 
-namespace vcpkg::PostBuildLint::ConfigurationType
+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(ConfigurationTypeC::ENUM_NAME);
 
     static const std::string NAME_DEBUG = "Debug";
     static const std::string NAME_RELEASE = "Release";
 
-    const std::string& Type::to_string() const
+    const std::string& ConfigurationType::to_string() const
     {
         switch (this->backing_enum)
         {
-        case ConfigurationType::DEBUG:
+        case ConfigurationTypeC::DEBUG:
             return NAME_DEBUG;
-        case ConfigurationType::RELEASE:
+        case ConfigurationTypeC::RELEASE:
             return NAME_RELEASE;
-        case ConfigurationType::NULLVALUE:
+        case ConfigurationTypeC::NULLVALUE:
             return NULLVALUE_STRING;
         default:
             Checks::unreachable(VCPKG_LINE_INFO);