Fix compilation with libc++

seznam · Jun 3, 2019 · 8d7bce6 · 8d7bce6
1 parent 7c9c8c2
commit 8d7bce6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/include/superior_mysqlpp/uncaught_exception_counter.hpp b/include/superior_mysqlpp/uncaught_exception_counter.hpp
@@ -10,11 +10,15 @@ namespace SuperiorMySqlpp
 {
     inline int uncaughtExceptions() noexcept
     {
+#if defined(__clang__) && _LIBCPPABI_VERSION >= 1002
+        return static_cast<int>(__cxxabiv1::__cxa_uncaught_exceptions());
+#else
         auto* globalsPtr = __cxxabiv1::__cxa_get_globals();
         auto* globalsEreasedPtr = reinterpret_cast<char*>(globalsPtr);
         auto* uncaughtExceptionsErasedPtr = globalsEreasedPtr + sizeof(void*);
         auto* uncaughtExceptionsPtr = reinterpret_cast<int*>(uncaughtExceptionsErasedPtr);
         return *uncaughtExceptionsPtr;
+#endif
     }
 
     class UncaughtExceptionCounter

diff --git a/packages/_debian-common/changelog b/packages/_debian-common/changelog
@@ -1,8 +1,12 @@
 libsuperiormysqlpp (0.4.1) UNRELEASED; urgency=medium
 
+  [ Peter Opatril ]
   * refactor: Logging system (DRY)
   * feat: Default logger logs errors
 
+  [ Adam Stepan ]
+  * Fix compilation with libc++
+
  -- Peter Opatril <[email protected]>  Fri, 24 May 2019 14:07:13 +0000
 
 libsuperiormysqlpp (0.4.0) unstable; urgency=medium