Correct warning message, and update comments.

[ci-skip]

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index d458ddc..07e7cbc 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -253,7 +253,6 @@ typedef struct s_smx_activity* smx_activity_t;
 
 /** Pointer to a SimGrid barrier object */
 typedef s4u_Barrier* sg_bar_t;
-/** Constant pointer to a SimGrid barrier object */
 typedef s4u_Comm* sg_comm_t;
 typedef s4u_Exec* sg_exec_t;
 typedef const s4u_Exec* const_sg_exec_t;

diff --git a/include/xbt/module.h b/include/xbt/module.h
index 8d1b027..601f7f4 100644 (file)
--- a/include/xbt/module.h
+++ b/include/xbt/module.h
@@ -8,10 +8,8 @@
 #ifndef XBT_MODULE_H
 #define XBT_MODULE_H
 
-// 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
+// Deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v338)
+#warning xbt/module.h is deprecated and will be removed after v3.37.
 
 #include <simgrid/engine.h>
 #include <xbt/base.h>

diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 9696e53..53ccfaf 100644 (file)
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -11,10 +11,8 @@
 #include <simgrid/actor.h>
 #include <xbt/base.h>
 
-// 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
+// Deprecation warning on include (remove entire file with XBT_ATTRIB_DEPRECATED_v338)
+#warning xbt/virtu.h is deprecated and will be removed after v3.37.
 
 SG_BEGIN_DECL