Use git diff instead of diff-index for setlocalversion.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index af47c6498a9be603b0e8e292c2cc4cfcf5520321..efeac389fea8aec6f92c4dc6dde2081153197719 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -181,7 +181,7 @@ static void install_signal_handler()
     action.sa_handler = signal_handler;
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_RESTART;
-    if (sigaction(SIGINT, &action, NULL) == -1) {
+    if (sigaction(SIGINT, &action, nullptr) == -1) {
         std::cerr << "ERROR: sigaction: " << strerror(errno) << "\n";
         exit(EXIT_FAILURE_OTHER);
     }
@@ -201,8 +201,8 @@ int main(int argc, char* argv[])
 {
     int exit_status = 0;   // global exit status
     double simulated_time = -1.0;
-    timestamp elapsed_time(timestamp::wallclock_time);
-    timestamp simulation_time(timestamp::cpu_time);
+    timestamp elapsed_time(timestamp::clock_type::WALLCLOCK);
+    timestamp simulation_time(timestamp::clock_type::CPU);
     msg_error_t res;
 
     elapsed_time.start();
@@ -294,7 +294,7 @@ int main(int argc, char* argv[])
     simulated_time = MSG_get_clock();
     XBT_INFO("Simulation ended at %f.", simulated_time);
 
-    process::set_proc_mutex(NULL);
+    process::set_proc_mutex(nullptr);
     delete proc_cond;
     delete proc_mutex;