Merge branch 'master' of github.com:simgrid/simgrid into s_type_cleanup

[simgrid.git] / src / xbt / exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 2f5e882acab0314e8a59e3c33609c2d323a135b6..5483ae5370302e3e5be33cce61e7d055c7e3c6a8 100644 (file)
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -90,7 +90,7 @@ static void handler()
   // an uncaught exception
   static std::atomic_flag lock = ATOMIC_FLAG_INIT;
   if (lock.test_and_set()) {
-    XBT_ERROR("Multiple uncaught exceptions");
+    XBT_ERROR("Handling an exception raised an exception. Bailing out.");
     std::abort();
   }
 
@@ -132,8 +132,3 @@ void installExceptionHandler()
 
 }
 }
-
-void xbt_set_terminate()
-{
-  simgrid::xbt::installExceptionHandler();
-}