Fixed some compilation warnings

This commit is contained in:
matlabbe
2021-10-07 09:22:01 -04:00
parent b531f96c31
commit 1f600abda6
13 changed files with 47 additions and 7 deletions
+4
View File
@@ -458,7 +458,11 @@ void CommonDataSubscriber::depthOdomDataScanDescInfoCallback(
void CommonDataSubscriber::setupDepthCallbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+4
View File
@@ -458,7 +458,11 @@ void CommonDataSubscriber::rgbOdomDataScanDescInfoCallback(
void CommonDataSubscriber::setupRGBCallbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+4
View File
@@ -533,7 +533,11 @@ void CommonDataSubscriber::rgbdOdomDataInfoCallback(
void CommonDataSubscriber::setupRGBDCallbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+4
View File
@@ -343,7 +343,11 @@ void CommonDataSubscriber::rgbd2OdomDataInfoCallback(
void CommonDataSubscriber::setupRGBD2Callbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+4
View File
@@ -430,7 +430,11 @@ void CommonDataSubscriber::rgbd3OdomDataInfoCallback(
void CommonDataSubscriber::setupRGBD3Callbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDescriptor,
+4
View File
@@ -398,7 +398,11 @@ void CommonDataSubscriber::rgbd4OdomDataInfoCallback(
void CommonDataSubscriber::setupRGBD4Callbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+4
View File
@@ -320,7 +320,11 @@ void CommonDataSubscriber::rgbdXOdomDataInfoCallback(
void CommonDataSubscriber::setupRGBDXCallbacks(
rclcpp::Node& node,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeScan2d,
bool subscribeScan3d,
bool subscribeScanDesc,
+9 -1
View File
@@ -272,14 +272,22 @@ void CommonDataSubscriber::setupScanCallbacks(
bool scan2dTopic,
bool scanDescTopic,
bool subscribeOdom,
#ifdef RTABMAP_SYNC_USER_DATA
bool subscribeUserData,
#else
bool,
#endif
bool subscribeOdomInfo,
int queueSize,
bool approxSync)
{
RCLCPP_INFO(node.get_logger(), "Setup scan callback");
if(subscribeOdom || subscribeUserData || subscribeOdomInfo)
if(subscribeOdom ||
#ifdef RTABMAP_SYNC_USER_DATA
subscribeUserData ||
#endif
subscribeOdomInfo)
{
if(scanDescTopic)
{