X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bf033cc925aa31693ef5163ea056fde5b75ff1e..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/include/simgrid/jedule/jedule_events.hpp

diff --git a/include/simgrid/jedule/jedule_events.hpp b/include/simgrid/jedule/jedule_events.hpp
index 3c853e3162..e7987cb486 100644
--- a/include/simgrid/jedule/jedule_events.hpp
+++ b/include/simgrid/jedule/jedule_events.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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. */
@@ -19,36 +19,23 @@ namespace jedule{
 
 class XBT_PUBLIC Event {
 public:
-  Event(std::string name, double start_time, double end_time, std::string type);
-  ~Event();
-  void add_characteristic(char* characteristic);
-  void add_resources(std::vector<sg_host_t>* host_selection);
-  void add_info(char* key, char* value);
-  void print(FILE* file);
-
-  // deprecated
-  XBT_ATTRIB_DEPRECATED_v323("Please use Event::add_characteristic()") void addCharacteristic(char* characteristic)
-  {
-    add_characteristic(characteristic);
-  }
-  XBT_ATTRIB_DEPRECATED_v323("Please use Event::add_resources()") void addResources(
-      std::vector<sg_host_t>* host_selection)
+  Event(const std::string& name, double start_time, double end_time, const std::string& type)
+      : name_(name), start_time_(start_time), end_time_(end_time), type_(type)
   {
-    add_resources(host_selection);
-  }
-  XBT_ATTRIB_DEPRECATED_v323("Please use Event::add_info()") void addInfo(char* key, char* value)
-  {
-    add_info(key, value);
   }
+  void add_characteristic(const char* characteristic);
+  void add_resources(const std::vector<sg_host_t>& host_selection);
+  void add_info(char* key, char* value);
+  void print(FILE* file) const;
 
 private:
   std::string name_;
   double start_time_;
   double end_time_;
   std::string type_;
-  std::vector<jed_subset_t>* resource_subsets_;
-  std::vector<char*> characteristics_list_;   /* just a list of names */
-  std::unordered_map<char*, char*> info_map_; /* key/value pairs */
+  std::vector<Subset> resource_subsets_;
+  std::vector<std::string> characteristics_list_;         /* just a list of names */
+  std::unordered_map<std::string, std::string> info_map_; /* key/value pairs */
 };
 }
 }