Revert "chore: add workaround for tf2 update (autowarefoundation#5127)"

This reverts commit 19ab508.
zulfaqar-azmi-t4 · Sep 26, 2023 · aae172b · aae172b
1 parent 19ab508
commit aae172b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 25 deletions.
diff --git a/common/autoware_auto_geometry/CMakeLists.txt b/common/autoware_auto_geometry/CMakeLists.txt
@@ -12,12 +12,6 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
   src/bounding_box.cpp
 )
 
-if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
-  target_compile_definitions(${PROJECT_NAME} PRIVATE
-    DEFINE_LEGACY_FUNCTION
-  )
-endif()
-
 if(BUILD_TESTING)
   set(GEOMETRY_GTEST geometry_gtest)
   set(GEOMETRY_SRC test/src/test_geometry.cpp

diff --git a/common/autoware_auto_tf2/CMakeLists.txt b/common/autoware_auto_tf2/CMakeLists.txt
@@ -17,11 +17,6 @@ if(BUILD_TESTING)
     "tf2_geometry_msgs"
     "tf2_ros"
   )
-  if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
-    target_compile_definitions(test_tf2_autoware_auto_msgs PRIVATE
-      DEFINE_LEGACY_FUNCTION
-    )
-  endif()
 endif()
 
 ament_auto_package()
diff --git a/common/autoware_auto_tf2/include/autoware_auto_tf2/tf2_autoware_auto_msgs.hpp b/common/autoware_auto_tf2/include/autoware_auto_tf2/tf2_autoware_auto_msgs.hpp
@@ -45,7 +45,7 @@ using BoundingBox = autoware_auto_perception_msgs::msg::BoundingBox;
 
 namespace tf2
 {
-#ifdef DEFINE_LEGACY_FUNCTION
+
 /*************/
 /** Point32 **/
 /*************/
@@ -94,7 +94,6 @@ inline void doTransform(
     t_out.points[i].z = static_cast<float>(v_out[2]);
   }
 }
-#endif
 
 /******************/
 /** Quaternion32 **/

diff --git a/planning/behavior_path_planner/CMakeLists.txt b/planning/behavior_path_planner/CMakeLists.txt
@@ -58,12 +58,6 @@ ament_auto_add_library(behavior_path_planner_node SHARED
   src/marker_utils/lane_change/debug.cpp
 )
 
-if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
-  target_compile_definitions(behavior_path_planner_node PRIVATE
-    DEFINE_LEGACY_FUNCTION
-  )
-endif()
-
 target_include_directories(behavior_path_planner_node SYSTEM PUBLIC
   ${EIGEN3_INCLUDE_DIR}
 )

diff --git a/planning/surround_obstacle_checker/CMakeLists.txt b/planning/surround_obstacle_checker/CMakeLists.txt
@@ -18,12 +18,6 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
   src/node.cpp
 )
 
-if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
-  target_compile_definitions(${PROJECT_NAME} PRIVATE
-    DEFINE_LEGACY_FUNCTION
-  )
-endif()
-
 target_link_libraries(${PROJECT_NAME}
   ${PCL_LIBRARIES}
 )