Skip to content

Commit 8254e28

Browse files
christian-rauchobyalian
authored andcommitted
replace custom definitions with '__has_include' header check
1 parent 1104367 commit 8254e28

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

orbbec_camera/include/orbbec_camera/ob_camera_node.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
#include <fcntl.h>
7070
#include <unistd.h>
7171

72-
#if defined(ROS_JAZZY) || defined(ROS_IRON)
72+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
7373
#include <cv_bridge/cv_bridge.hpp>
74-
#else
74+
#elif __has_include(<cv_bridge/cv_bridge.h>)
7575
#include <cv_bridge/cv_bridge.h>
7676
#endif
7777

orbbec_camera/src/d2c_viewer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*******************************************************************************/
1616

17-
#if defined(ROS_JAZZY) || defined(ROS_IRON)
17+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
1818
#include <cv_bridge/cv_bridge.hpp>
19-
#else
19+
#elif __has_include(<cv_bridge/cv_bridge.h>)
2020
#include <cv_bridge/cv_bridge.h>
2121
#endif
2222
#include <sensor_msgs/image_encodings.hpp>

0 commit comments

Comments
 (0)