fix: make uncaughtExceptions compilable with libc++

seznam · Jul 23, 2019 · b734556 · b734556
1 parent 79c7290
commit b734556
Show file tree

Hide file tree

Showing 2 changed files with 9 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,17 @@ namespace SuperiorMySqlpp
 {
     inline int uncaughtExceptions() noexcept
     {
+    // There is no `__cxa_get_clobals` in newer libc++ abi, so we are forced to use
+    // `__cxa_uncaught_exceptions`
+#if defined(_LIBCPPABI_VERSION) && _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
@@ -3,6 +3,9 @@ libsuperiormysqlpp (0.5.1) UNRELEASED; urgency=medium
   [ Radek Smejdir ]
   * chore: Update bandit submodule to current HEAD
 
+  [ Adam Stepan ]
+  * fix: Make `uncaughtExceptions` compilable with libc++
+
  -- Peter Opatril <[email protected]>  Thu, 20 Jun 2019 13:10:51 +0000
 
 libsuperiormysqlpp (0.5.0) unstable; urgency=medium