X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a96adb51dabc0c759af11e60c770355f22a54ef3..6f5244f66ccb7d30d43a57d3a2a54710b204c6e9:/include/simgrid/jedule/jedule_platform.hpp?ds=sidebyside diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp index 9510ad01b0..5e40d67784 100644 --- a/include/simgrid/jedule/jedule_platform.hpp +++ b/include/simgrid/jedule/jedule_platform.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2010-2012, 2014-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -7,19 +6,18 @@ #ifndef JED_SIMGRID_PLATFORM_H_ #define JED_SIMGRID_PLATFORM_H_ -#include "simgrid_config.h" -#include "simgrid/forward.h" -#include "xbt/dynar.h" +#include +#include + #include #include #include -#if SIMGRID_HAVE_JEDULE namespace simgrid { namespace jedule{ -XBT_PUBLIC_CLASS Container { +class XBT_PUBLIC Container { public: - Container(std::string name); + explicit Container(std::string name); virtual ~Container(); private: int last_id; @@ -39,7 +37,7 @@ public: void printResources(FILE *file); }; -XBT_PUBLIC_CLASS Subset { +class XBT_PUBLIC Subset { public: Subset(int s, int n, Container* p); virtual ~Subset()=default; @@ -50,12 +48,8 @@ public: } } -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); -} - -#endif #endif /* JED_SIMGRID_PLATFORM_H_ */