X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f29b38ef2a056daa14bbfda2fce78063faa773d4..d47d44b2ed067c834ef210ad544512e7581a1c8e:/main.cpp

diff --git a/main.cpp b/main.cpp
index df1126a..dbc5b43 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,9 @@
-#include <cstring>              // for strlen()
+#include <cstring>
 #include <iostream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "misc.h"
-#include "parameters.h"
+#include "options.h"
 #include "process.h"
 #include "timer.h"
 #include "version.h"
@@ -46,19 +46,19 @@ int main(int argc, char *argv[])
     MSG_global_init(&argc, argv);
 
     // Parse global parameters
-    int parse_res = param::parse_args(&argc, argv);
+    int parse_res = opt::parse_args(&argc, argv);
     if (!parse_res
-        || param::version_requested || param::help_requested) {
-        if (param::version_requested)
+        || opt::version_requested || opt::help_requested) {
+        if (opt::version_requested)
             std::clog << version::name << " version " << version::num << "\n"
                       << version::copyright << "\n"
                 "Compiled on " << version::date << "\n\n";
-        if (!parse_res || param::help_requested)
-            param::usage();
+        if (!parse_res || opt::help_requested)
+            opt::usage();
         MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
-    param::print();
+    opt::print();
 
     TRY {    
         exit_status = EXIT_FAILURE_INIT; // =====
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
         MSG_function_register("Calculs", simulation_main);
 
         // Create the platform and the application.
-        MSG_create_environment(param::platform_file);
+        MSG_create_environment(opt::platform_file);
         if (LOG_ISENABLED(xbt_log_priority_verbose)) {
             int n = MSG_get_host_number();
             m_host_t *h = MSG_get_host_table();
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
                 VERB2("Host #%d named \"%s\".", i, MSG_host_get_name(h[i]));
             xbt_free(h);
         }
-        MSG_launch_application(param::application_file);
+        MSG_launch_application(opt::application_file);
 
         exit_status = EXIT_FAILURE_SIMU; // =====