Merge remote-tracking branch 'origin/jazzy' into prepare-2.12.1

sea-bass · sea-bass · commit 33dd496e919f · 2024-12-18T08:14:53.000-05:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,7 +28,7 @@ jobs:
       # TODO(andyz): When this clang-tidy issue is fixed, remove -Wno-unknown-warning-option
       # https://stackoverflow.com/a/41673702
       CXXFLAGS: >-
-        -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option -Wno-cpp
+        -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option
       CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
       DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
       UPSTREAM_WORKSPACE: >
diff --git a/moveit_ros/moveit_servo/src/servo_node.cpp b/moveit_ros/moveit_servo/src/servo_node.cpp
@@ -38,9 +38,14 @@
  *
  */
 
-#include <moveit_servo/servo_node.hpp>
+#if __has_include(<realtime_tools/realtime_helpers.hpp>)
+#include <realtime_tools/realtime_helpers.hpp>
+#else
 #include <realtime_tools/thread_priority.hpp>
+#endif
+
 #include <moveit/utils/logger.hpp>
+#include <moveit_servo/servo_node.hpp>
 
 namespace moveit_servo
 {

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,14 @@`
`38`	`38`	`*`
`39`	`39`	`*/`
`40`	`40`
`41`		`-#include <moveit_servo/servo_node.hpp>`
	`41`	`+#if __has_include(<realtime_tools/realtime_helpers.hpp>)`
	`42`	`+#include <realtime_tools/realtime_helpers.hpp>`
	`43`	`+#else`
`42`	`44`	`#include <realtime_tools/thread_priority.hpp>`
	`45`	`+#endif`
	`46`	`+`
`43`	`47`	`#include <moveit/utils/logger.hpp>`
	`48`	`+#include <moveit_servo/servo_node.hpp>`
`44`	`49`
`45`	`50`	`namespace moveit_servo`
`46`	`51`	`{`