fix gcc 6.2 builds

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

diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index 2acf99c..b112f36 100644 (file)
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -5,16 +5,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/internal_config.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/internal_config.h"

-#include "src/simdag/simdag_private.h"

 #include "simgrid/simdag.h"
 #include "xbt/file.h"
 #include <string.h>
 #include "simgrid/simdag.h"
 #include "xbt/file.h"
 #include <string.h>

+#include "simdag_private.hpp"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
 
 #if HAVE_GRAPHVIZ
 #include <graphviz/cgraph.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
 
 #if HAVE_GRAPHVIZ
 #include <graphviz/cgraph.h>

-#endif

 
 typedef enum {
   sequential =0,
 
 typedef enum {
   sequential =0,


@@ -253,3 +252,15 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool
   }
   return result;
 }
   }
   return result;
 }

+#else
+xbt_dynar_t SD_dotload(const char *filename) {
+  xbt_die("SD_dotload_generic() is not usable because graphviz was not found.\n"
+      "Please install graphviz, graphviz-dev, and libgraphviz-dev (and erase CMakeCache.txt) before recompiling.");
+}
+xbt_dynar_t SD_dotload_with_sched(const char *filename) {
+  return SD_dotload(filename);
+}
+xbt_dynar_t SD_PTG_dotload(const char * filename) {
+  return SD_dotload(filename);
+}
+#endif