Preparation for the removal of THROW1 in SG/svn.

diff --git a/TODO b/TODO
index d59eb3cae1b026a013f12f54e1a3acbd8a2c3500..bee25a179b71121fbe999a425be5ce214eebe580 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+* When ready, remove hack for THROWF in main.cpp.
+

 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.
 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.

diff --git a/main.cpp b/main.cpp
index 76125e9db0b639a3d7e027b6b5ceb7c99d637c04..c2b1d185c28f1fe6d665bf18f079caf0715dd9eb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,12 @@
 #include <msg/msg.h>
 #include <xbt/log.h>
 
 #include <msg/msg.h>
 #include <xbt/log.h>
 

+// Don't look at this dirty hack...
+// Delete it when THROWF comes in SG/svn.
+#ifndef THROWF
+#define THROWF(...) THROW1(__VA_ARGS__)
+#endif
+

 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
 XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");
 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
 XBT_LOG_NEW_SUBCATEGORY(main, simu, "Messages from global infrastructure");


@@ -98,10 +104,10 @@ static int simulation_main(int argc, char* argv[])
         delete proc;
     }
     catch (const std::invalid_argument& e) {
         delete proc;
     }
     catch (const std::invalid_argument& e) {

-        THROW1(arg_error, 0, "%s", e.what());
+        THROWF(arg_error, 0, "%s", e.what());

     }
     catch (const std::exception& e) {
     }
     catch (const std::exception& e) {

-        THROW1(0, 0, "%s", e.what());
+        THROWF(0, 0, "%s", e.what());

     }
     return result;
 }
     }
     return result;
 }


@@ -255,7 +261,7 @@ int main(int argc, char* argv[])
         delete proc_mutex;
 
         if (res != MSG_OK)
         delete proc_mutex;
 
         if (res != MSG_OK)

-            THROW1(0, 0, "MSG_main() failed with status %#x", res);
+            THROWF(0, 0, "MSG_main() failed with status %#x", res);

 
         exit_status = EXIT_NO_FAILURE; // =====
     }
 
         exit_status = EXIT_NO_FAILURE; // =====
     }