X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6a7d990e6208bbd5f76abff2db292395506e205..ecd5f7562caf1d443bf22788fa5f4fac408776ec:/include/simgrid/jedule/jedule_platform.hpp diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp index 6c0055ed00..9510ad01b0 100644 --- 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 #include #include -#if HAVE_JEDULE +#if SIMGRID_HAVE_JEDULE namespace simgrid { namespace jedule{ @@ -32,7 +32,7 @@ public: std::vector resource_list; void addChild(Container* child); void addResources(std::vector hosts); - void createHierarchy(AS_t from_as); + void createHierarchy(sg_netzone_t from_as); std::vector 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* subset_list, std::vector *host_list); - -SG_END_DECL() +} #endif