In C++ files, replace SG_{BEGIN,END}+_DECL() by extern "C" { }.

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

diff --git a/include/simgrid/jedule/jedule_events.hpp b/include/simgrid/jedule/jedule_events.hpp
index 757e720..704d4f6 100644 (file)
--- a/include/simgrid/jedule/jedule_events.hpp
+++ b/include/simgrid/jedule/jedule_events.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
@@ -15,14 +15,13 @@
 
 #include "jedule_platform.hpp"
 
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
 namespace simgrid {
 namespace jedule{
 
 XBT_PUBLIC_CLASS Event{
   public:
-    Event(std::string name, double start_time, double end_time, std::string type)
-      : name(name), start_time(start_time), end_time(end_time), type(type){}
+    Event(std::string name, double start_time, double end_time, std::string type);
     ~Event();
     void addCharacteristic(char *characteristic);
     void addResources(std::vector<sg_host_t> *host_selection);
@@ -34,18 +33,16 @@ XBT_PUBLIC_CLASS Event{
     double start_time;
     double end_time;
     std::string type;
-    std::vector<jed_res_subset_t> resource_subsets;
+    std::vector<jed_subset_t> *resource_subsets;
     std::vector<char*> characteristics_list; /* just a list of names (strings) */
     std::unordered_map<char*, char*> info_map;     /* key/value pairs */
 };
 }
 }
 
-SG_BEGIN_DECL()
-
+extern "C" {
 typedef simgrid::jedule::Event * jed_event_t;
-
-SG_END_DECL()
+}
 
 #endif