Merge pull request #1 from Microsoft/master

pull

1 files changed, 19 insertions, 9 deletions

diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index d5433b1f5..02d3480a2 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -1,23 +1,26 @@
+#include "pch.h"
 #include "vcpkg_Checks.h"
-
-#include <stdexcept>
 #include "vcpkg_System.h"
 
-namespace vcpkg {namespace Checks
+namespace vcpkg::Checks
 {
-    void unreachable()
+    __declspec(noreturn) void unreachable()
     {
         System::println(System::color::error, "Error: Unreachable code was reached");
+#ifndef NDEBUG
+        std::abort();
+#else
         exit(EXIT_FAILURE);
+#endif
     }
 
-    void exit_with_message(const char* errorMessage)
+    __declspec(noreturn) void exit_with_message(const char* errorMessage)
     {
         System::println(System::color::error, errorMessage);
         exit(EXIT_FAILURE);
     }
 
-    void throw_with_message(const char* errorMessage)
+    __declspec(noreturn) void throw_with_message(const char* errorMessage)
     {
         throw std::runtime_error(errorMessage);
     }
@@ -30,12 +33,19 @@ namespace vcpkg {namespace Checks
         }
     }
 
-    void check_exit(bool expression, const char* errorMessage)
+    void check_exit(bool expression)
     {
         if (!expression)
         {
-            System::println(System::color::error, errorMessage);
             exit(EXIT_FAILURE);
         }
     }
-}}
+
+    void check_exit(bool expression, const char* errorMessage)
+    {
+        if (!expression)
+        {
+            exit_with_message(errorMessage);
+        }
+    }
+}