Deprecate legacy xbt_ex; kill xbt_errcat_t.

[simgrid.git] / src / simgrid / Exception.cpp

diff --git a/src/simgrid/Exception.cpp b/src/simgrid/Exception.cpp
index cd4fc1f..ed0a7e9 100644 (file)
--- a/src/simgrid/Exception.cpp
+++ b/src/simgrid/Exception.cpp
@@ -9,6 +9,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 namespace simgrid {
 
+// DO NOT define destructors for exceptions in Exception.hpp.
+// Defining it here ensures that the exceptions are defined only in libsimgrid, but not in libsimgrid-java.
+// Doing otherwise naturally breaks things (at least on freebsd with clang).
+
+Exception::~Exception()                         = default;
 ForcefulKillException::~ForcefulKillException() = default;
 
 void ForcefulKillException::do_throw()
@@ -16,7 +21,7 @@ void ForcefulKillException::do_throw()
   throw ForcefulKillException();
 }
 
-bool ForcefulKillException::try_n_catch(std::function<void(void)> try_block)
+bool ForcefulKillException::try_n_catch(const std::function<void()>& try_block)
 {
   bool res;
   try {