Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / simdag / sd_daxloader.cpp

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 6dfe768..2c8ced7 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -4,12 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/simdag/simdag_private.h"
 #include "simgrid/simdag.h"
 #include "xbt/misc.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/file.h" /* xbt_basename() */
+#include "simdag_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 
@@ -40,7 +40,7 @@ static bool children_are_marked(SD_task_t task){
     if (it->marked == 0)
       return false;
   for (SD_task_t it : *task->outputs)
-    if ((*it)->marked == 0)
+    if (it->marked == 0)
       return false;
   return true;
 }
@@ -305,7 +305,7 @@ void STag_dax__job()
   xbt_dynar_push(result, &current_job);
 }
 
-void STag_dax__uses(void)
+void STag_dax__uses()
 {
   double size = xbt_str_parse_double(A_dax__uses_size, "Parse error: %s is not a double");
   int is_input = (A_dax__uses_link == A_dax__uses_link_input);