i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-12 07:19:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace custom definitions with '__has_include' header check

Browse Source
This commit is contained in:
Christian Rauch
2025-04-24 08:35:44 +02:00
parent f11850d5bc
commit e493177fe9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/include/orbbec_camera/ob_camera_node.h
+2 -2
View File
@@ -64,9 +64,9 @@
#include "jpeg_decoder.h" #include "jpeg_decoder.h"
#include <std_msgs/msg/string.hpp> #include <std_msgs/msg/string.hpp>
#if defined(ROS_JAZZY) || defined(ROS_IRON) #if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp> #include <cv_bridge/cv_bridge.hpp>
#else #elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h> #include <cv_bridge/cv_bridge.h>
#endif #endif
orbbec_camera/src/d2c_viewer.cpp
+2 -2
View File
@@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
#if defined(ROS_JAZZY) || defined(ROS_IRON) #if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp> #include <cv_bridge/cv_bridge.hpp>
#else #elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h> #include <cv_bridge/cv_bridge.h>
#endif #endif
#include <sensor_msgs/image_encodings.hpp> #include <sensor_msgs/image_encodings.hpp>