Since we skip a release, use XBT_ATTRIB_DEPRECATED_v338 instead of v337

diff --git a/docs/source/Doxyfile b/docs/source/Doxyfile
index 822b323..d27aedb 100644 (file)
--- a/docs/source/Doxyfile
+++ b/docs/source/Doxyfile
@@ -69,4 +69,4 @@ PREDEFINED             += \
     XBT_ATTRIB_DEPRECATED_v334(mesg)= \
     XBT_ATTRIB_DEPRECATED_v335(mesg)= \
     XBT_ATTRIB_DEPRECATED_v336(mesg)= \
-    XBT_ATTRIB_DEPRECATED_v337(mesg)=
+    XBT_ATTRIB_DEPRECATED_v338(mesg)=

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index 63a44e4..4b14e56 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -185,7 +185,7 @@ public:
   const char* what() const noexcept { return msg_.c_str(); }
 
   XBT_ATTRIB_NORETURN static void do_throw();
-  XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static bool try_n_catch(
+  XBT_ATTRIB_DEPRECATED_v338("Please manifest if you actually need this function") static bool try_n_catch(
       const std::function<void()>& try_block);
 
 private:

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 3c6a4eb..2460a5e 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -267,9 +267,9 @@ public:
    *  dependency or no resource assigned) */
   void on_this_veto_cb(const std::function<void(AnyActivity&)>& cb) { on_this_veto.connect(cb); }
 
-  XBT_ATTRIB_DEPRECATED_v337("Please use on_suspend_cb() instead") static void on_suspended_cb(
+  XBT_ATTRIB_DEPRECATED_v338("Please use on_suspend_cb() instead") static void on_suspended_cb(
       const std::function<void(Activity const&)>& cb) { on_suspend.connect(cb); }
-  XBT_ATTRIB_DEPRECATED_v337("Please use on_resume_cb() instead") static void on_resumed_cb(
+  XBT_ATTRIB_DEPRECATED_v338("Please use on_resume_cb() instead") static void on_resumed_cb(
       const std::function<void(Activity const&)>& cb) { on_resume.connect(cb);  }
 
   AnyActivity* add_successor(ActivityPtr a)

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index a6a7f08..e5b8ad4 100644 (file)
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -79,9 +79,9 @@ public:
   void on_this_start_cb(const std::function<void(Comm const&)>& cb) { on_this_start.connect(cb); }
 
   CommPtr set_copy_data_callback(const std::function<void(kernel::activity::CommImpl*, void*, size_t)>& callback);
-  XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_buffer_callback(
+  XBT_ATTRIB_DEPRECATED_v338("Please manifest if you actually need this function") static void copy_buffer_callback(
       kernel::activity::CommImpl*, void*, size_t);
-  XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_pointer_callback(
+  XBT_ATTRIB_DEPRECATED_v338("Please manifest if you actually need this function") static void copy_pointer_callback(
       kernel::activity::CommImpl*, void*, size_t);
 
   ~Comm() override;

diff --git a/include/simgrid/s4u/Disk.hpp b/include/simgrid/s4u/Disk.hpp
index 8a09719..eec006c 100644 (file)
--- a/include/simgrid/s4u/Disk.hpp
+++ b/include/simgrid/s4u/Disk.hpp
@@ -150,7 +150,7 @@ public:
     on_this_onoff.connect(cb);
   }
 
-  XBT_ATTRIB_DEPRECATED_v337("Please use on_onoff_cb() instead") static void on_state_change_cb(
+  XBT_ATTRIB_DEPRECATED_v338("Please use on_onoff_cb() instead") static void on_state_change_cb(
       const std::function<void(Disk const&)>& cb)
   {
     on_onoff.connect(cb);

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index d29468e..3b40ae7 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -77,7 +77,7 @@ public:
   {
     on_onoff.connect(cb);
   }
-  XBT_ATTRIB_DEPRECATED_v337("Please use on_onoff_cb() instead") static void on_state_change_cb(
+  XBT_ATTRIB_DEPRECATED_v338("Please use on_onoff_cb() instead") static void on_state_change_cb(
       const std::function<void(Host const&)>& cb)
   {
     on_onoff.connect(cb);

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index 3e0832b..13a92bc 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -133,7 +133,7 @@ public:
   double get_load() const;
 
 #ifndef DOXYGEN
-  XBT_ATTRIB_DEPRECATED_v337("Please use get_load() instead") double get_usage() const
+  XBT_ATTRIB_DEPRECATED_v338("Please use get_load() instead") double get_usage() const
   {
     return get_load();
   }
@@ -202,7 +202,7 @@ public:
     on_this_destruction.connect(cb);
   }
 
-  XBT_ATTRIB_DEPRECATED_v337("Please use on_onoff_cb() instead") static void on_state_change_cb(
+  XBT_ATTRIB_DEPRECATED_v338("Please use on_onoff_cb() instead") static void on_state_change_cb(
       const std::function<void(Link const&)>& cb)
   {
     on_onoff.connect(cb);

diff --git a/include/xbt/base.h b/include/xbt/base.h
index d12022c..934ddf8 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -48,8 +48,8 @@
   XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.34)")
 #define XBT_ATTRIB_DEPRECATED_v336(mesg)                                                                               \
   XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.35)")
-#define XBT_ATTRIB_DEPRECATED_v337(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.36)")
+#define XBT_ATTRIB_DEPRECATED_v338(mesg)                                                                               \
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.37)")
 
 /* Work around https://github.com/microsoft/vscode-cpptools/issues/4503 */
 #ifdef __INTELLISENSE__

diff --git a/include/xbt/module.h b/include/xbt/module.h
index ee9d548..8d1b027 100644 (file)
--- a/include/xbt/module.h
+++ b/include/xbt/module.h
@@ -8,7 +8,7 @@
 #ifndef XBT_MODULE_H
 #define XBT_MODULE_H
 
-// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v337)
+// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v338)
 #ifndef XBT_MODULE_H_NO_DEPRECATED_WARNING
 #warning xbt/module.h is deprecated and will be removed in v3.37.
 #endif
@@ -18,7 +18,7 @@
 
 SG_BEGIN_DECL
 
-XBT_ATTRIB_DEPRECATED_v337("Please use simgrid_init(&argc, argv) instead") static void xbt_init(int* argc, char** argv)
+XBT_ATTRIB_DEPRECATED_v338("Please use simgrid_init(&argc, argv) instead") static void xbt_init(int* argc, char** argv)
 {
   simgrid_init(argc, argv);
 }

diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 0789a9a..9696e53 100644 (file)
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -11,19 +11,19 @@
 #include <simgrid/actor.h>
 #include <xbt/base.h>
 
-// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v337)
+// avoid deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v338)
 #ifndef XBT_VIRTU_H_NO_DEPRECATED_WARNING
 #warning xbt/virtu.h is deprecated and will be removed in v3.37.
 #endif
 
 SG_BEGIN_DECL
 
-XBT_ATTRIB_DEPRECATED_v337("Please use sg_actor_self_get_name()") static const char* xbt_procname(void)
+XBT_ATTRIB_DEPRECATED_v338("Please use sg_actor_self_get_name()") static const char* xbt_procname(void)
 {
   return sg_actor_self_get_name();
 }
 
-XBT_ATTRIB_DEPRECATED_v337("Please use sg_actor_self_get_pid()") static int xbt_getpid(void)
+XBT_ATTRIB_DEPRECATED_v338("Please use sg_actor_self_get_pid()") static int xbt_getpid(void)
 {
   return sg_actor_self_get_pid();
 };

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index ac97c56..315a2f8 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -29,7 +29,7 @@ CommPtr Comm::set_copy_data_callback(const std::function<void(kernel::activity::
 }
 
 void Comm::copy_buffer_callback(kernel::activity::CommImpl* comm, void* buff,
-                                size_t buff_size) // XBT_ATTRIB_DEPRECATED_v337
+                                size_t buff_size) // XBT_ATTRIB_DEPRECATED_v338
 {
   XBT_DEBUG("Copy the data over");
   memcpy(comm->dst_buff_, buff, buff_size);
@@ -41,7 +41,7 @@ void Comm::copy_buffer_callback(kernel::activity::CommImpl* comm, void* buff,
 }
 
 void Comm::copy_pointer_callback(kernel::activity::CommImpl* comm, void* buff,
-                                 size_t buff_size) // XBT_ATTRIB_DEPRECATED_v337
+                                 size_t buff_size) // XBT_ATTRIB_DEPRECATED_v338
 {
   xbt_assert((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
   *(void**)(comm->dst_buff_) = buff;

diff --git a/src/simgrid/Exception.cpp b/src/simgrid/Exception.cpp
index 9694c6b..7152419 100644 (file)
--- a/src/simgrid/Exception.cpp
+++ b/src/simgrid/Exception.cpp
@@ -31,7 +31,7 @@ void ForcefulKillException::do_throw()
   throw ForcefulKillException();
 }
 
-bool ForcefulKillException::try_n_catch(const std::function<void()>& try_block) // XBT_ATTRIB_DEPRECATED_v337
+bool ForcefulKillException::try_n_catch(const std::function<void()>& try_block) // XBT_ATTRIB_DEPRECATED_v338
 {
   bool res;
   try {