Fixes for clang-cl

Author: jeremy-rifkin

include/cpptrace/from_current_macros.hpp

@@ -17,19 +17,33 @@
 #endif
 
 #ifdef _MSC_VER
+ #if defined(__clang__)
+  #define CPPTRACE_PUSH_EXTENSION_WARNINGS \
+     _Pragma("clang diagnostic push") \
+     _Pragma("clang diagnostic ignored \"-Wlanguage-extension-token\"")
+  #define CPPTRACE_POP_EXTENSION_WARNINGS \
+     _Pragma("clang diagnostic pop")
+ #else
+  #define CPPTRACE_PUSH_EXTENSION_WARNINGS
+  #define CPPTRACE_POP_EXTENSION_WARNINGS
+ #endif
  #define CPPTRACE_TYPE_FOR(param) \
      typename ::cpptrace::detail::argument<void(param)>::type
  // this awful double-IILE is due to C2713 "You can't use structured exception handling (__try/__except) and C++
  // exception handling (try/catch) in the same function."
  #define CPPTRACE_TRY \
      try { \
          [&]() -> ::cpptrace::detail::dont_return_from_try_catch_macros { \
+             CPPTRACE_PUSH_EXTENSION_WARNINGS \
              __try { \
+             CPPTRACE_POP_EXTENSION_WARNINGS \
                  return [&]() -> ::cpptrace::detail::dont_return_from_try_catch_macros {
  #define CPPTRACE_CATCH(param) \
                      return ::cpptrace::detail::dont_return_from_try_catch_macros(); \
                  }(); \
+             CPPTRACE_PUSH_EXTENSION_WARNINGS \
              } __except(::cpptrace::detail::exception_filter<CPPTRACE_TYPE_FOR(param)>(GetExceptionInformation())) { \
+             CPPTRACE_POP_EXTENSION_WARNINGS \
                  CPPTRACE_UNREACHABLE(); \
              } \
          }(); \

src/binary/pe.cpp

@@ -84,7 +84,7 @@ namespace detail {
         } else {
             // 64 bit
             // I get an "error: 'QWORD' was not declared in this scope" for some reason when using QWORD
-            auto bytes = load_bytes<unsigned __int64>(file, nt_header_offset + 0x18 + 0x18); // optional header + 0x18
+            auto bytes = load_bytes<std::uint64_t>(file, nt_header_offset + 0x18 + 0x18); // optional header + 0x18
             if(!bytes) {
                 return std::move(bytes).unwrap_error();
             }

src/from_current.cpp

@@ -84,10 +84,17 @@ namespace detail {
          std::int32_t pCatchableTypeArray;
      };
      #pragma warning(disable:4200)
+     #if IS_CLANG
+     #pragma clang diagnostic push
+     #pragma clang diagnostic ignored "-Wc99-extensions"
+     #endif
      struct CatchableTypeArray {
          uint32_t nCatchableTypes;
          int32_t arrayOfCatchableTypes[];
      };
+     #if IS_CLANG
+     #pragma clang diagnostic pop
+     #endif
      #pragma warning (pop)
      #pragma pack(pop)
     #else
@@ -563,6 +570,7 @@ CPPTRACE_BEGIN_NAMESPACE
     namespace detail {
         #ifdef _MSC_VER
         bool matches_exception(EXCEPTION_POINTERS* exception_ptrs, const std::type_info& type_info) {
+            CPPTRACE_PUSH_EXTENSION_WARNINGS
             __try {
                 auto* exception_record = exception_ptrs->ExceptionRecord;
                 // Check if the SEH exception is a C++ exception
@@ -572,6 +580,7 @@ CPPTRACE_BEGIN_NAMESPACE
             } __except(EXCEPTION_EXECUTE_HANDLER) {
                 // pass
             }
+            CPPTRACE_POP_EXTENSION_WARNINGS
             return false;
         }
         #else