Update python/clusters-multicpu to the new API.

[simgrid.git] / include / simgrid / kernel / resource / Action.hpp

diff --git a/include/simgrid/kernel/resource/Action.hpp b/include/simgrid/kernel/resource/Action.hpp
index 9524e89e0ae9171cc9ea300b7cde05a9c336596b..48b11434665d9c6a5c1da7187ec576e97a8561f3 100644 (file)
--- a/include/simgrid/kernel/resource/Action.hpp
+++ b/include/simgrid/kernel/resource/Action.hpp
@@ -13,6 +13,7 @@
 #include <boost/heap/pairing_heap.hpp>
 #include <boost/optional.hpp>
 #include <string>
+#include <string_view>
 
 static constexpr double NO_MAX_DURATION = -1.0;
 
@@ -66,7 +67,6 @@ class XBT_PUBLIC Action {
 
   double cost_;
   Model* model_;
-  void* data_                       = nullptr; /**< for your convenience - XBT_ATTRIB_DEPRECATED_v334 */
   activity::ActivityImpl* activity_ = nullptr;
 
   /* LMM */
@@ -155,17 +155,6 @@ public:
   /** @brief Get the finish time of the current action */
   double get_finish_time() const { return finish_time_; }
 
-  /** @brief Get the user data associated to the current action */
-  XBT_ATTRIB_DEPRECATED_v334("Please manifest if you actually need this function") void* get_data() const
-  {
-    return data_;
-  }
-  /** @brief Set the user data associated to the current action */
-  XBT_ATTRIB_DEPRECATED_v334("Please manifest if you actually need this function") void set_data(void* data)
-  {
-    data_ = data;
-  }
-
   /** @brief Get the user data associated to the current action */
   activity::ActivityImpl* get_activity() const { return activity_; }
   /** @brief Set the user data associated to the current action */
@@ -225,7 +214,7 @@ public:
   /** @brief Get the tracing category associated to the current action */
   const std::string& get_category() const { return category_; }
   /** @brief Set the tracing category of the current Action */
-  void set_category(const std::string& category) { category_ = category; }
+  void set_category(std::string_view category) { category_ = category; }
 
   /** @brief Get the sharing_penalty (RTT or 1/thread_count) of the current Action */
   double get_sharing_penalty() const { return sharing_penalty_; };