X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16673e04b393c2d8c031d0d77ec318ac2c711f4e..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/xbt/exception.cpp?ds=sidebyside

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 4fd03bc71a..41db24db88 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -65,7 +65,6 @@ const char* xbt_ex_catname(xbt_errcat_t cat)
     default:
       return "INVALID ERROR";
   }
-  return "INVALID ERROR";
 }
 
 namespace simgrid {
@@ -146,8 +145,9 @@ static void handler()
     std::abort();
   }
 
-  catch (simgrid::kernel::context::Context::StopRequest& e) {
-    XBT_ERROR("Received a StopRequest at the top-level exception handler. Maybe a Java->C++ call that is not protected "
+  catch (simgrid::ForcefulKillException const& e) {
+    XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Maybe a Java->C++ call that is not "
+              "protected "
               "in a try/catch?");
     show_backtrace(bt);
   }