Rework BuildInfo enum

1 files changed, 38 insertions, 38 deletions

diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index b5cfef13a..1048b59bd 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -3,7 +3,7 @@
 #include "vcpkg_Enums.h"
 #include "vcpkg_Checks.h"
 
-namespace vcpkg::PostBuildLint::BuildPolicies
+namespace vcpkg::PostBuildLint
 {
     static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string(ENUM_NAME);
 
@@ -12,26 +12,51 @@ namespace vcpkg::PostBuildLint::BuildPolicies
     static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
     static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
 
-    const std::string& Type::to_string() const
+    BuildPolicies BuildPolicies::parse(const std::string& s)
+    {
+        if (s == NAME_EMPTY_PACKAGE)
+        {
+            return BuildPoliciesC::EMPTY_PACKAGE;
+        }
+
+        if (s == NAME_DLLS_WITHOUT_LIBS)
+        {
+            return BuildPoliciesC::DLLS_WITHOUT_LIBS;
+        }
+
+        if (s == NAME_ONLY_RELEASE_CRT)
+        {
+            return BuildPoliciesC::ONLY_RELEASE_CRT;
+        }
+
+        if (s == NAME_EMPTY_INCLUDE_FOLDER)
+        {
+            return BuildPoliciesC::EMPTY_INCLUDE_FOLDER;
+        }
+
+        return BuildPoliciesC::NULLVALUE;
+    }
+
+    const std::string& BuildPolicies::to_string() const
     {
         switch (this->backing_enum)
         {
-            case EMPTY_PACKAGE:
+            case BuildPoliciesC::EMPTY_PACKAGE:
                 return NAME_EMPTY_PACKAGE;
-            case DLLS_WITHOUT_LIBS:
+            case BuildPoliciesC::DLLS_WITHOUT_LIBS:
                 return NAME_DLLS_WITHOUT_LIBS;
-            case ONLY_RELEASE_CRT:
+            case BuildPoliciesC::ONLY_RELEASE_CRT:
                 return NAME_ONLY_RELEASE_CRT;
-            case EMPTY_INCLUDE_FOLDER:
+            case BuildPoliciesC::EMPTY_INCLUDE_FOLDER:
                 return NAME_EMPTY_INCLUDE_FOLDER;
-            case NULLVALUE:
+            case BuildPoliciesC::NULLVALUE:
                 return NULLVALUE_STRING;
             default:
                 Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
-    const std::string& Type::cmake_variable() const
+    const std::string& BuildPolicies::cmake_variable() const
     {
         static const std::string CMAKE_VARIABLE_EMPTY_PACKAGE = "VCPKG_POLICY_EMPTY_PACKAGE";
         static const std::string CMAKE_VARIABLE_DLLS_WITHOUT_LIBS = "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
@@ -40,43 +65,18 @@ namespace vcpkg::PostBuildLint::BuildPolicies
 
         switch (this->backing_enum)
         {
-            case EMPTY_PACKAGE:
+            case BuildPoliciesC::EMPTY_PACKAGE:
                 return CMAKE_VARIABLE_EMPTY_PACKAGE;
-            case DLLS_WITHOUT_LIBS:
+            case BuildPoliciesC::DLLS_WITHOUT_LIBS:
                 return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS;
-            case ONLY_RELEASE_CRT:
+            case BuildPoliciesC::ONLY_RELEASE_CRT:
                 return CMAKE_VARIABLE_ONLY_RELEASE_CRT;
-            case EMPTY_INCLUDE_FOLDER:
+            case BuildPoliciesC::EMPTY_INCLUDE_FOLDER:
                 return CMAKE_VARIABLE_EMPTY_INCLUDE_FOLDER;
-            case NULLVALUE:
+            case BuildPoliciesC::NULLVALUE:
                 Enums::nullvalue_used(VCPKG_LINE_INFO, ENUM_NAME);
             default:
                 Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
-
-    Type parse(const std::string& s)
-    {
-        if (s == NAME_EMPTY_PACKAGE)
-        {
-            return BuildPolicies::EMPTY_PACKAGE;
-        }
-
-        if (s == NAME_DLLS_WITHOUT_LIBS)
-        {
-            return BuildPolicies::DLLS_WITHOUT_LIBS;
-        }
-
-        if (s == NAME_ONLY_RELEASE_CRT)
-        {
-            return BuildPolicies::ONLY_RELEASE_CRT;
-        }
-
-        if (s == NAME_EMPTY_INCLUDE_FOLDER)
-        {
-            return BuildPolicies::EMPTY_INCLUDE_FOLDER;
-        }
-
-        return BuildPolicies::NULLVALUE;
-    }
 }