Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / xbt / xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 324c2bf..e718a4a 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -87,12 +87,12 @@ static void xbt_preinit()
   GetSystemInfo(&si);
   xbt_pagesize = si.dwPageSize;
 #elif HAVE_SYSCONF
-  xbt_pagesize = sysconf(_SC_PAGESIZE);
+  xbt_pagesize = static_cast<int>(sysconf(_SC_PAGESIZE));
 #else
 # error Cannot get page size.
 #endif
 
-  xbt_pagebits = log2(xbt_pagesize);
+  xbt_pagebits = static_cast<int>(log2(xbt_pagesize));
 
 #ifdef _TWO_DIGIT_EXPONENT
   /* Even printf behaves differently on Windows... */
@@ -128,7 +128,7 @@ void xbt_init(int *argc, char **argv)
 
   simgrid::xbt::binary_name = argv[0];
   for (int i = 0; i < *argc; i++)
-    simgrid::xbt::cmdline.push_back(argv[i]);
+    simgrid::xbt::cmdline.emplace_back(argv[i]);
 
   xbt_log_init(argc, argv);
 }