Simple-Robotics · ManifoldFR · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - bindings/python : Add missing arg names in `visualizer-visitor.hpp`
+- use deprecation, warning macros already provided by jrl-cmakemodules
+
+### Removed
+
+- Remove unused headers `deprecated-macros.hpp` and `deprecated-namespaces.hpp`
+- Remove header `pinocchio/deprecation.hpp`, directly use generated `pinocchio/deprecated.hpp`
+- macros.hpp : remove macros already provided by jrl-cmakemodules
 
 ## [3.7.0] - 2025-05-21
 

diff --git a/include/pinocchio/algorithm/parallel/geometry.hpp b/include/pinocchio/algorithm/parallel/geometry.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/algorithm/parallel/geometry.hpp, pinocchio/collision/parallel/geometry.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/algorithm/parallel/geometry.hpp, pinocchio/collision/parallel/geometry.hpp)
 // clang-format on
 
 #include "pinocchio/collision/parallel/geometry.hpp"

diff --git a/include/pinocchio/algorithm/parallel/omp.hpp b/include/pinocchio/algorithm/parallel/omp.hpp
@@ -6,7 +6,7 @@
 #define __pinocchio_algorithm_parallel_omp_hpp__
 
 #include "pinocchio/macros.hpp"
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(
+PINOCCHIO_DEPRECATED_HEADER(
   pinocchio / algorithm / parallel / omp.hpp, pinocchio / utils / openmp.hpp)
 #include "pinocchio/utils/openmp.hpp"
 

diff --git a/include/pinocchio/bindings/python/parsers/python.hpp b/include/pinocchio/bindings/python/parsers/python.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/bindings/python/parsers/python.hpp, pinocchio/parsers/python.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/bindings/python/parsers/python.hpp, pinocchio/parsers/python.hpp)
 // clang-format on
 
 #include "pinocchio/parsers/python.hpp"

diff --git a/include/pinocchio/deprecated-macros.hpp b/include/pinocchio/deprecated-macros.hpp
diff --git a/include/pinocchio/deprecated-namespaces.hpp b/include/pinocchio/deprecated-namespaces.hpp
diff --git a/include/pinocchio/deprecation.hpp b/include/pinocchio/deprecation.hpp
diff --git a/include/pinocchio/fwd.hpp b/include/pinocchio/fwd.hpp
@@ -26,7 +26,7 @@ namespace pinocchio
 #endif
 
 #include "pinocchio/macros.hpp"
-#include "pinocchio/deprecation.hpp"
+#include "pinocchio/deprecated.hpp"
 #include "pinocchio/warning.hpp"
 #include "pinocchio/config.hpp"
 #include "pinocchio/unsupported.hpp"

diff --git a/include/pinocchio/macros.hpp b/include/pinocchio/macros.hpp
@@ -6,7 +6,8 @@
 #ifndef __pinocchio_macros_hpp__
 #define __pinocchio_macros_hpp__
 
-#include <sstream>
+#include "pinocchio/deprecated.hpp"
+#include "pinocchio/warning.hpp"
 
 // On Windows, __cplusplus is not necessarily set to the C++ version being used.
 // See https://docs.microsoft.com/fr-fr/cpp/build/reference/zc-cplusplus?view=vs-2019 for further
@@ -36,28 +37,8 @@
   #define PINOCCHIO_MAC_ARM64
 #endif
 
-#define PINOCCHIO_STRING_LITERAL(string) #string
 #define PINOCCHIO_NOEXCEPT noexcept
 
-// For more details, visit
-// https://stackoverflow.com/questions/171435/portability-of-warning-preprocessor-directive
-#if defined(__GNUC__) || defined(__clang__)
-  #define PINOCCHIO_PRAGMA(x) _Pragma(#x)
-  #define PINOCCHIO_PRAGMA_MESSAGE(the_message) PINOCCHIO_PRAGMA(GCC message #the_message)
-  #define PINOCCHIO_PRAGMA_WARNING(the_message) PINOCCHIO_PRAGMA(GCC warning #the_message)
-  #define PINOCCHIO_PRAGMA_DEPRECATED(the_message)                                                 \
-    PINOCCHIO_PRAGMA_WARNING(Deprecated : #the_message)
-  #define PINOCCHIO_PRAGMA_DEPRECATED_HEADER(old_header, new_header)                               \
-    PINOCCHIO_PRAGMA_WARNING(Deprecated header file : #old_header has been replaced                \
-                               by #new_header.\n Please use #new_header instead of #old_header.)
-#else
-  #define PINOCCHIO_PRAGMA(x)
-  #define PINOCCHIO_PRAGMA_MESSAGE(the_message)
-  #define PINOCCHIO_PRAGMA_WARNING(the_message)
-  #define PINOCCHIO_PRAGMA_DEPRECATED(the_message)
-  #define PINOCCHIO_PRAGMA_DEPRECATED_HEADER(old_header, new_header)
-#endif
-
 /// \brief Function attribute to forbid inlining.
 /// This is a compiler hint that can be not respected.
 #define PINOCCHIO_DONT_INLINE EIGEN_DONT_INLINE
@@ -244,7 +225,7 @@ PINOCCHIO_COMPILER_DIAGNOSTIC_IGNORED_VARIADIC_MACROS
 #define _PINOCCHIO_CHECK_ARGUMENT_SIZE_2(size, expected_size)                                      \
   _PINOCCHIO_CHECK_ARGUMENT_SIZE_3(                                                                \
     size, expected_size,                                                                           \
-    PINOCCHIO_STRING_LITERAL(size) " is different from " PINOCCHIO_STRING_LITERAL(expected_size))
+    PINOCCHIO_WARN_STRINGISE(size) " is different from " PINOCCHIO_WARN_STRINGISE(expected_size))
 
 #define _PINOCCHIO_CHECK_ARGUMENT_SIZE_1
 

diff --git a/include/pinocchio/math/casadi.hpp b/include/pinocchio/math/casadi.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/math/casadi.hpp, pinocchio/autodiff/casadi.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/math/casadi.hpp, pinocchio/autodiff/casadi.hpp)
 // clang-format on
 
 #include "pinocchio/autodiff/casadi.hpp"

diff --git a/include/pinocchio/math/cppad.hpp b/include/pinocchio/math/cppad.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/math/cppad.hpp, pinocchio/autodiff/cppad.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/math/cppad.hpp, pinocchio/autodiff/cppad.hpp)
 // clang-format on
 
 #include "pinocchio/autodiff/cppad.hpp"

diff --git a/include/pinocchio/math/cppadcg.hpp b/include/pinocchio/math/cppadcg.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/math/cppadcg.hpp, pinocchio/codegen/cppadcg.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/math/cppadcg.hpp, pinocchio/codegen/cppadcg.hpp)
 // clang-format on
 
 #include "pinocchio/codegen/cppadcg.hpp"

diff --git a/include/pinocchio/parsers/sample-models.hpp b/include/pinocchio/parsers/sample-models.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(pinocchio/parsers/sample-models.hpp, pinocchio/multibody/sample-models.hpp)
+PINOCCHIO_DEPRECATED_HEADER(pinocchio/parsers/sample-models.hpp, pinocchio/multibody/sample-models.hpp)
 // clang-format on
 
 #include "pinocchio/multibody/sample-models.hpp"

diff --git a/include/pinocchio/spatial/fcl-pinocchio-conversions.hpp b/include/pinocchio/spatial/fcl-pinocchio-conversions.hpp
@@ -8,7 +8,7 @@
 #include "pinocchio/macros.hpp"
 
 // clang-format off
-PINOCCHIO_PRAGMA_DEPRECATED_HEADER(
+PINOCCHIO_DEPRECATED_HEADER(
   pinocchio/spatial/fcl-pinocchio-conversions.hpp,
   pinocchio/collision/fcl-pinocchio-conversions.hpp)
 // clang-format on

diff --git a/include/pinocchio/unsupported.hpp b/include/pinocchio/unsupported.hpp
@@ -5,7 +5,7 @@
 #ifndef __pinocchio_unsupported_hpp__
 #define __pinocchio_unsupported_hpp__
 
-#include "pinocchio/deprecation.hpp"
+#include "pinocchio/deprecated.hpp"
 
 #define PINOCCHIO_UNSUPPORTED PINOCCHIO_DEPRECATED
 #define PINOCCHIO_UNSUPPORTED_MESSAGE PINOCCHIO_DEPRECATED_MESSAGE

diff --git a/sources.cmake b/sources.cmake
@@ -173,9 +173,6 @@ set(${PROJECT_NAME}_CORE_PUBLIC_HEADERS
     ${PROJECT_SOURCE_DIR}/include/pinocchio/context.hpp
     ${PROJECT_SOURCE_DIR}/include/pinocchio/core/binary-op.hpp
     ${PROJECT_SOURCE_DIR}/include/pinocchio/core/unary-op.hpp
-    ${PROJECT_SOURCE_DIR}/include/pinocchio/deprecated-macros.hpp
-    ${PROJECT_SOURCE_DIR}/include/pinocchio/deprecated-namespaces.hpp
-    ${PROJECT_SOURCE_DIR}/include/pinocchio/deprecation.hpp
     ${PROJECT_SOURCE_DIR}/include/pinocchio/eigen-macros.hpp
     ${PROJECT_SOURCE_DIR}/include/pinocchio/fwd.hpp
     ${PROJECT_SOURCE_DIR}/include/pinocchio/macros.hpp