remove a useless C -> C++ function

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 837829f..4c24f32 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -659,7 +659,5 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define XBT_HERE(...) XBT_LOG(xbt_log_priority_trace, "-- was here" __VA_ARGS__)
 
-XBT_PUBLIC(void) xbt_set_terminate();
-
 SG_END_DECL()
 #endif                          /* ! _XBT_LOG_H_ */

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 2f5e882..ad829c2 100644 (file)
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -132,8 +132,3 @@ void installExceptionHandler()
 
 }
 }
-
-void xbt_set_terminate()
-{
-  simgrid::xbt::installExceptionHandler();
-}

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 026641b..945304e 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -13,6 +13,7 @@
 #include "simgrid_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/log.hpp"
 #include "xbt/dynar.h"
 #include "xbt/config.h"
 
@@ -129,7 +130,7 @@ static void xbt_postexit(void)
 /** @brief Initialize the xbt mechanisms. */
 void xbt_init(int *argc, char **argv)
 {
-  xbt_set_terminate();
+  simgrid::xbt::installExceptionHandler();
 
   if (xbt_initialized++) {
     XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);