Merge branch 'dev'

Author: jeremy-rifkin

cmake/Autoconfig.cmake

@@ -4,6 +4,8 @@ function(check_support var source includes libraries definitions)
   list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
   set(CMAKE_REQUIRED_LIBRARIES "${libraries}")
   set(CMAKE_REQUIRED_DEFINITIONS "${definitions}")
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
   string(CONCAT full_source "#include \"${source}\"" ${nonce})
   check_cxx_source_compiles(${full_source} ${var})
   set(${var} ${${var}} PARENT_SCOPE)

src/utils.cpp

@@ -40,7 +40,7 @@ namespace cpptrace {
         }
     }
 
-    [[noreturn]] void terminate_handler() {
+    [[noreturn]] void MSVC_CDECL terminate_handler() {
         // TODO: Support std::nested_exception?
         try {
             auto ptr = std::current_exception();

src/utils/common.hpp

@@ -25,6 +25,12 @@
  #define NODISCARD
 #endif
 
+#if IS_MSVC
+ #define MSVC_CDECL __cdecl
+#else
+ #define MSVC_CDECL
+#endif
+
 namespace cpptrace {
 namespace detail {
     static const stacktrace_frame null_frame {