Use git diff instead of diff-index for setlocalversion.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 0a5db8c014078d13c2d41374ce9b2058618d3e73..0af3e3b214482d58e372d9b5f7e99856b5b3eb2a 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -5,7 +5,7 @@
 #include <numeric>
 #include <sstream>
 #include <vector>
 #include <numeric>
 #include <sstream>
 #include <vector>

-#include <msg/msg.h>
+#include <simgrid/msg.h>

 #include <xbt/dynar.h>
 #include <xbt/log.h>
 
 #include <xbt/dynar.h>
 #include <xbt/log.h>
 


@@ -93,7 +93,7 @@ void deployment_generator::distribute_load()
 
 void deployment_generator::deploy()
 {
 
 void deployment_generator::deploy()
 {

-    xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), NULL);
+    xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), nullptr);

     for (unsigned i = 0 ; i < hosts.size() ; ++i) {
         const char* hostname = hostdata::at(i).get_name();
         std::ostringstream oss;
     for (unsigned i = 0 ; i < hosts.size() ; ++i) {
         const char* hostname = hostdata::at(i).get_name();
         std::ostringstream oss;