Merge pull request #589 from jcarpent/devel

deprecation: change handling of deprecated macros

CMakeLists.txt

@@ -64,7 +64,6 @@ OPTION (INITIALIZE_WITH_NAN "Initialize Eigen entries with NaN" OFF)
 OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON)
 OPTION (BUILD_WITH_LUA_SUPPORT "Build the lua parser" OFF)
 OPTION (BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF)
-OPTION (DISABLE_DEPRECATED_MACRO_WARNING "Disable warnings related to deprecated macro" OFF)
 
 IF (INITIALIZE_WITH_NAN)
   MESSAGE (STATUS "Initialize with NaN all the Eigen entries.")
@@ -81,10 +80,6 @@ MACRO(TAG_LIBRARY_VERSION target)
   SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${PROJECT_VERSION})
 ENDMACRO(TAG_LIBRARY_VERSION)
 
-IF(DISABLE_DEPRECATED_MACRO_WARNING)
-  ADD_DEFINITIONS(-DPINOCCHIO_DISABLE_DEPRECATED_MACRO_WARNING)
-ENDIF(DISABLE_DEPRECATED_MACRO_WARNING)
-
 # ----------------------------------------------------
 # --- DEPENDANCIES -----------------------------------
 # ----------------------------------------------------

src/deprecated-macros.hpp

@@ -19,29 +19,20 @@
 #define __pinocchio_deprecated_macros_hpp__
 
 #ifdef PINOCCHIO_WITH_HPP_FCL
-  #ifndef WITH_HPP_FCL
-    #define WITH_HPP_FCL // for backward compatibility
-  #endif
-  #ifndef PINOCCHIO_DISABLE_DEPRECATED_MACRO_WARNING
-    #pragma message("'WITH_HPP_FCL' is deprecated. Please use PINOCCHIO_WITH_HPP_FCL instead.")
+  #ifdef PINOCCHIO_ENABLE_COMPATIBILITY_WITH_VERSION_1 // for backward compatibility
+    #define WITH_HPP_FCL
   #endif
 #endif
 
 #ifdef PINOCCHIO_WITH_URDFDOM
-  #ifndef WITH_URDFDOM
-    #define WITH_URDFDOM // for backward compatibility
-  #endif
-  #ifndef PINOCCHIO_DISABLE_DEPRECATED_MACRO_WARNING
-    #pragma message("'WITH_URDFDOM' is deprecated. Please use PINOCCHIO_WITH_URDFDOM instead.")
+  #ifdef PINOCCHIO_ENABLE_COMPATIBILITY_WITH_VERSION_1 // for backward compatibility
+    #define WITH_URDFDOM
   #endif
 #endif
 
 #ifdef PINOCCHIO_WITH_LUA5
-  #ifndef WITH_LUA5
-    #define WITH_LUA5 // for backward compatibility
-  #endif
-  #ifndef PINOCCHIO_DISABLE_DEPRECATED_MACRO_WARNING
-    #pragma message("'WITH_LUA5' is deprecated. Please use PINOCCHIO_WITH_LUA5 instead.")
+  #ifdef PINOCCHIO_ENABLE_COMPATIBILITY_WITH_VERSION_1 // for backward compatibility
+    #define WITH_LUA5
   #endif
 #endif