Merge pull request #101 from mul-cps/fix_deps

fix dependencies
This commit is contained in:
jjiszjj
2025-04-29 16:37:15 +08:00
committed by GitHub
6 changed files with 11 additions and 28 deletions
+2 -2
View File
@@ -14,9 +14,9 @@
* 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>
#else
#elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h>
#endif
#include <sensor_msgs/image_encodings.hpp>
-11
View File
@@ -26,16 +26,5 @@ ParametersBackend::~ParametersBackend() {
ros_callback_.reset();
}
}
#if defined(ROS_JAZZY) || defined(ROS_IRON)
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnSetParametersCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#else
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#endif
} // namespace orbbec_camera