[ci] Fix a build issue with libstdc++13 until it gets fixed in boost

ossia · May 23, 2023 · a883b26 · a883b26
1 parent 740bede
commit a883b26
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/src/ossia/context.cpp b/src/ossia/context.cpp
@@ -36,7 +36,12 @@ boost::asio::detail::winsock_init<>::manual manual_winsock_init;
 
 namespace ossia
 {
+invalid_callback_error::invalid_callback_error() = default;
 invalid_callback_error::~invalid_callback_error() = default;
+const char* invalid_callback_error::what() const noexcept
+{
+  return "Bad callback";
+}
 
 static void ossia_global_init()
 {

diff --git a/src/ossia/dataflow/graph/graph_utils.hpp b/src/ossia/dataflow/graph/graph_utils.hpp
@@ -24,11 +24,10 @@
 
 #include <ankerl/unordered_dense.h>
 
-#if defined(BOOST_COMP_GNUC)
-#if BOOST_COMP_GNUC >= BOOST_VERSION_NUMBER(13, 0, 0)
+#if BOOST_LIB_STD_GNU >= BOOST_VERSION_NUMBER(13, 0, 0) \
+    && BOOST_VERSION_NUMBER <= BOOST_VERSION_NUMBER(1, 83, 0)
 #define OSSIA_SMALL_VECTOR_ALLOCATOR_REBIND_FAILS 1
 #endif
-#endif
 
 class DataflowTest;
 namespace ossia

diff --git a/src/ossia/detail/callback_container.hpp b/src/ossia/detail/callback_container.hpp
@@ -18,18 +18,11 @@ namespace ossia
  *
  * Means that an invalid callback was passed
  */
-struct OSSIA_EXPORT invalid_callback_error final : public std::logic_error
+struct OSSIA_EXPORT invalid_callback_error final : public std::exception
 {
-  invalid_callback_error(const char* e)
-      : std::logic_error(e)
-  {
-  }
-
   ~invalid_callback_error() override;
-  invalid_callback_error()
-      : std::logic_error("Bad callback")
-  {
-  }
+  invalid_callback_error();
+  const char* what() const noexcept override;
 };
 
 template <typename T>
@@ -231,4 +224,5 @@ class callback_container
   impl m_callbacks TS_GUARDED_BY(m_mutx);
   mutable mutex m_mutx;
 };
+
 }