Revert "Remove deprecated features for the new next release (3.34)" until after the...

[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 aac2b9e024f61434b08456d53a70ae23adfd5e70..b75750e30b1e25e3d29183286f0a4648cdae573b 100644 (file)
--- a/include/simgrid/kernel/resource/Action.hpp
+++ b/include/simgrid/kernel/resource/Action.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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. */
@@ -13,12 +13,11 @@
 #include <boost/heap/pairing_heap.hpp>
 #include <boost/optional.hpp>
 #include <string>
+#include <string_view>
 
 static constexpr double NO_MAX_DURATION = -1.0;
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 using heap_element_type = std::pair<double, Action*>;
 using heap_type =
@@ -68,7 +67,7 @@ class XBT_PUBLIC Action {
 
   double cost_;
   Model* model_;
-  void* data_                       = nullptr; /**< for your convenience */
+  void* data_                       = nullptr; /**< for your convenience - XBT_ATTRIB_DEPRECATED_v334 */
   activity::ActivityImpl* activity_ = nullptr;
 
   /* LMM */
@@ -158,9 +157,15 @@ public:
   double get_finish_time() const { return finish_time_; }
 
   /** @brief Get the user data associated to the current action */
-  void* get_data() const { return data_; }
+  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 */
-  void set_data(void* data) { data_ = data; }
+  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_; }
@@ -221,7 +226,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_; };
@@ -267,7 +272,5 @@ public:
   void set_suspend_state(Action::SuspendStates state) { suspended_ = state; }
 };
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 #endif