Merge branch 'master' into fix/execute_benched

[simgrid.git] / include / simgrid / jedule / jedule_platform.hpp

diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp
index 6c0055e..9510ad0 100644 (file)
--- a/include/simgrid/jedule/jedule_platform.hpp
+++ b/include/simgrid/jedule/jedule_platform.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2012, 2014-2016. The SimGrid Team.
+/* Copyright (c) 2010-2012, 2014-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <vector>
 #include <string>
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
 
 namespace simgrid {
 namespace jedule{
@@ -32,7 +32,7 @@ public:
   std::vector<sg_host_t> resource_list;
   void addChild(Container* child);
   void addResources(std::vector<sg_host_t> hosts);
-  void createHierarchy(AS_t from_as);
+  void createHierarchy(sg_netzone_t from_as);
   std::vector<int> getHierarchy();
   std::string getHierarchyAsString();
   void print(FILE *file);
@@ -50,12 +50,11 @@ public:
 
 }
 }
-SG_BEGIN_DECL()
+extern "C" {
 typedef simgrid::jedule::Container * jed_container_t;
 typedef simgrid::jedule::Subset * jed_subset_t;
 void get_resource_selection_by_hosts(std::vector<jed_subset_t>* subset_list, std::vector<sg_host_t> *host_list);
-
-SG_END_DECL()
+}
 
 #endif