X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/fdbf720097c9e51eef43f0c9811ab5899789349a..90be05ea066850842c6445f8432df6f260ea75fb:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index c2b1d18..91e08a2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,12 +6,6 @@
 #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");
@@ -172,7 +166,7 @@ int main(int argc, char* argv[])
     // Note: variables used after THROW must be declared as volatile.
     volatile int exit_status = 0;   // global exit status
     volatile double simulated_time = -1.0;
-    timestamp simulation_time;
+    timestamp simulation_time(timestamp::cpu_time);
     xbt_ex_t ex;
     MSG_error_t res;
 
@@ -242,9 +236,9 @@ int main(int argc, char* argv[])
         }
 
         // Register tracing categories
-        TRACE_category(TRACE_CAT_COMP);
-        TRACE_category(TRACE_CAT_CTRL);
-        TRACE_category(TRACE_CAT_DATA);
+        TRACE_category_with_color(TRACE_CAT_COMP, TRACE_COLOR_COMP);
+        TRACE_category_with_color(TRACE_CAT_CTRL, TRACE_COLOR_CTRL);
+        TRACE_category_with_color(TRACE_CAT_DATA, TRACE_COLOR_DATA);
 
         exit_status = EXIT_FAILURE_SIMU; // =====