Getting rid of C exceptions

[simgrid.git] / src / simix / smx_environment.cpp

diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp
index 3d82fd9..372f255 100644 (file)
--- a/src/simix/smx_environment.cpp
+++ b/src/simix/smx_environment.cpp
@@ -32,19 +32,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  xbt_ex_t e;
   double start = 0, end = 0;
   if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
     start = xbt_os_time();
-  TRY {
+  try {
     parse_platform_file(file);
-  } CATCH (e) {
-    xbt_die("Error while loading %s: %s", file, e.msg);
+  }
+  catch (xbt_ex& e) {
+    xbt_die("Error while loading %s: %s", file, e.what());
   }
   if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
     end = xbt_os_time();
   XBT_DEBUG("PARSE TIME: %g", (end - start));
-
 }
 
 void SIMIX_post_create_environment(void)