Remove Enums::unreachable(). Use Checks::unreachable() instead

6 files changed, 11 insertions, 15 deletions

diff --git a/toolsrc/include/vcpkg_Enums.h b/toolsrc/include/vcpkg_Enums.h
index 5c4dc8b06..b1ecc311b 100644
--- a/toolsrc/include/vcpkg_Enums.h
+++ b/toolsrc/include/vcpkg_Enums.h
@@ -6,6 +6,4 @@ namespace vcpkg::Enums
     std::string nullvalue_toString(const std::string& enum_name);
 
     __declspec(noreturn) void nullvalue_used(const std::string& enum_name);
-
-    __declspec(noreturn) void unreachable(const std::string& enum_name);
 }
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index f070a2a42..07464bb4e 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "PostBuildLint_BuildPolicies.h"
 #include "vcpkg_Enums.h"
+#include "vcpkg_Checks.h"
 
 namespace vcpkg::PostBuildLint::BuildPolicies
 {
@@ -23,7 +24,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
             case NULLVALUE:
                 return NULLVALUE_STRING;
             default:
-                Enums::unreachable(ENUM_NAME);
+                Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
@@ -44,7 +45,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
             case NULLVALUE:
                 Enums::nullvalue_used(ENUM_NAME);
             default:
-                Enums::unreachable(ENUM_NAME);
+                Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp
index f2fb292d7..593d976f2 100644
--- a/toolsrc/src/PostBuildLint_BuildType.cpp
+++ b/toolsrc/src/PostBuildLint_BuildType.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "PostBuildLint_BuildType.h"
-#include "vcpkg_Enums.h"
+#include "vcpkg_Checks.h"
 
 namespace vcpkg::PostBuildLint::BuildType
 {
@@ -26,7 +26,7 @@ namespace vcpkg::PostBuildLint::BuildType
             return RELEASE_DYNAMIC;
         }
 
-        Enums::unreachable(ENUM_NAME);
+        Checks::unreachable(VCPKG_LINE_INFO);
     }
 
     const ConfigurationType::type& type::config() const
@@ -57,7 +57,7 @@ namespace vcpkg::PostBuildLint::BuildType
             case BuildType::RELEASE_DYNAMIC:
                 return REGEX_RELEASE_DYNAMIC;
             default:
-                Enums::unreachable(ENUM_NAME);
+                Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
@@ -79,7 +79,7 @@ namespace vcpkg::PostBuildLint::BuildType
             case BuildType::RELEASE_DYNAMIC:
                 return NAME_RELEASE_DYNAMIC;
             default:
-                Enums::unreachable(ENUM_NAME);
+                Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 }
diff --git a/toolsrc/src/PostBuildLint_ConfigurationType.cpp b/toolsrc/src/PostBuildLint_ConfigurationType.cpp
index 990b10a37..cca6eb63a 100644
--- a/toolsrc/src/PostBuildLint_ConfigurationType.cpp
+++ b/toolsrc/src/PostBuildLint_ConfigurationType.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "PostBuildLint_ConfigurationType.h"
 #include "vcpkg_Enums.h"
+#include "package_spec.h"
 
 namespace vcpkg::PostBuildLint::ConfigurationType
 {
@@ -20,7 +21,7 @@ namespace vcpkg::PostBuildLint::ConfigurationType
         case ConfigurationType::NULLVALUE:
             return NULLVALUE_STRING;
         default:
-            Enums::unreachable(ENUM_NAME);
+            Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 }
diff --git a/toolsrc/src/PostBuildLint_LinkageType.cpp b/toolsrc/src/PostBuildLint_LinkageType.cpp
index 6d2c2c935..c6cb9ed58 100644
--- a/toolsrc/src/PostBuildLint_LinkageType.cpp
+++ b/toolsrc/src/PostBuildLint_LinkageType.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "PostBuildLint_LinkageType.h"
 #include "vcpkg_Enums.h"
+#include "vcpkg_Checks.h"
 
 namespace vcpkg::PostBuildLint::LinkageType
 {
@@ -20,7 +21,7 @@ namespace vcpkg::PostBuildLint::LinkageType
         case LinkageType::NULLVALUE:
             return NULLVALUE_STRING;
         default:
-            Enums::unreachable(ENUM_NAME);
+            Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
diff --git a/toolsrc/src/vcpkg_Enums.cpp b/toolsrc/src/vcpkg_Enums.cpp
index 6197e729f..0a6662894 100644
--- a/toolsrc/src/vcpkg_Enums.cpp
+++ b/toolsrc/src/vcpkg_Enums.cpp
@@ -13,9 +13,4 @@ namespace vcpkg::Enums
     {
         Checks::exit_with_message("NULLVALUE of enum %s was used", enum_name);
     }
-
-    __declspec(noreturn) void unreachable(const std::string& enum_name)
-    {
-        Checks::exit_with_message("Unreachable code for enum, %s", enum_name);
-    }
 }