Use CATCH_ANONYMOUS whenever possible.

diff --git a/src/bindings/java/smx_context_java.c b/src/bindings/java/smx_context_java.c
index 08a4a74..dc5a3dd 100644 (file)
--- a/src/bindings/java/smx_context_java.c
+++ b/src/bindings/java/smx_context_java.c
@@ -55,10 +55,9 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
                                     void_pfn_smxprocess_t cleanup_func,
                                     void* data)
 {
-       xbt_ex_t e;
-       static int thread_amount=0;
-       smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
-       thread_amount++;
+  static int thread_amount=0;
+  smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
+  thread_amount++;
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if (code) {
@@ -78,13 +77,13 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
 
     TRY {        
        context->thread = xbt_os_thread_create(NULL,smx_ctx_java_thread_run,context,NULL);
-    } CATCH(e) {
-       RETHROWF("Failed to create context #%d. You may want to switch to Java coroutines to increase your limits (error: %s)."
-                "See the Install section of simgrid-java documentation (in doc/install.html) for more on coroutines.",
-                       thread_amount);
     }
-  }
-  else {
+    CATCH_ANONYMOUS {
+      RETHROWF("Failed to create context #%d. You may want to switch to Java coroutines to increase your limits (error: %s)."
+               "See the Install section of simgrid-java documentation (in doc/install.html) for more on coroutines.",
+               thread_amount);
+    }
+  } else {
        context->thread = NULL;
     xbt_os_thread_set_extra_data(context);
   }

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 07f130d..5b34af3 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -97,8 +97,6 @@ void SIMIX_init_application(void){
  */
 void SIMIX_launch_application(const char *file)
 {
-  xbt_ex_t e;
-
   _XBT_GNUC_UNUSED int parse_status;
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
@@ -110,7 +108,8 @@ void SIMIX_launch_application(const char *file)
     parse_status = surf_parse();
     surf_parse_close();
     xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {
     XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
         file, surf_parse_lineno);
     RETHROW;