Getting rid of C exceptions

[simgrid.git] / src / msg / msg_synchro.cpp

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index d88e01f..fa6cad5 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -28,17 +28,13 @@ void MSG_sem_acquire(msg_sem_t sem) {
 
 /** @brief locks on a semaphore object up until the provided timeout expires */
 msg_error_t MSG_sem_acquire_timeout(msg_sem_t sem, double timeout) {
-  xbt_ex_t e;
   msg_error_t res = MSG_OK;
-  TRY {
+  try {
     simcall_sem_acquire_timeout(sem,timeout);
-  } CATCH(e) {
-    if (e.category == timeout_error) {
-      res = MSG_TIMEOUT;
-      xbt_ex_free(e);
-    } else {
-      RETHROW;
-    }
+  } catch(xbt_ex& e) {
+    if (e.category == timeout_error)
+      return MSG_TIMEOUT;
+    throw;
   }
   return res;
 }