Update to use non deprecated pluginlib macro

CPFL · Nov 1, 2017 · cccc138 · cccc138
1 parent ed6e94b
commit cccc138
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/velodyne_driver/src/driver/nodelet.cc b/velodyne_driver/src/driver/nodelet.cc
@@ -81,6 +81,5 @@ void DriverNodelet::devicePoll()
 
 // Register this plugin with pluginlib.  Names must match nodelet_velodyne.xml.
 //
-// parameters are: package, class name, class type, base class type
-PLUGINLIB_DECLARE_CLASS(velodyne_driver, DriverNodelet,
-                        velodyne_driver::DriverNodelet, nodelet::Nodelet);
+// parameters are: class type, base class type
+PLUGINLIB_EXPORT_CLASS(velodyne_driver::DriverNodelet, nodelet::Nodelet)
diff --git a/velodyne_pointcloud/src/conversions/cloud_nodelet.cc b/velodyne_pointcloud/src/conversions/cloud_nodelet.cc
@@ -42,8 +42,7 @@ namespace velodyne_pointcloud
 } // namespace velodyne_pointcloud
 
 
-// Register this plugin with pluginlib.  Names must match nodelet_velodyne.xml.
+// Register this plugin with pluginlib.  Names must match nodelets.xml.
 //
-// parameters: package, class name, class type, base class type
-PLUGINLIB_DECLARE_CLASS(velodyne_pointcloud, CloudNodelet,
-                        velodyne_pointcloud::CloudNodelet, nodelet::Nodelet);
+// parameters: class type, base class type
+PLUGINLIB_EXPORT_CLASS(velodyne_pointcloud::CloudNodelet, nodelet::Nodelet)
diff --git a/velodyne_pointcloud/src/conversions/ringcolors_nodelet.cc b/velodyne_pointcloud/src/conversions/ringcolors_nodelet.cc
@@ -43,8 +43,7 @@ namespace velodyne_pointcloud
 } // namespace velodyne_pointcloud
 
 
-// Register this plugin with pluginlib.  Names must match nodelet_velodyne.xml.
+// Register this plugin with pluginlib.  Names must match nodelets.xml.
 //
-// parameters: package, class name, class type, base class type
-PLUGINLIB_DECLARE_CLASS(velodyne_pointcloud, RingColorsNodelet,
-                        velodyne_pointcloud::RingColorsNodelet, nodelet::Nodelet);
+// parameters: class type, base class type
+PLUGINLIB_EXPORT_CLASS(velodyne_pointcloud::RingColorsNodelet, nodelet::Nodelet)
diff --git a/velodyne_pointcloud/src/conversions/transform_nodelet.cc b/velodyne_pointcloud/src/conversions/transform_nodelet.cc
@@ -42,9 +42,7 @@ namespace velodyne_pointcloud
 } // namespace velodyne_pointcloud
 
 
-// Register this plugin with pluginlib.  Names must match nodelet_velodyne.xml.
+// Register this plugin with pluginlib.  Names must match nodelets.xml.
 //
-// parameters: package, class name, class type, base class type
-PLUGINLIB_DECLARE_CLASS(velodyne_pointcloud, TransformNodelet,
-                        velodyne_pointcloud::TransformNodelet,
-                        nodelet::Nodelet);
+// parameters: class type, base class type
+PLUGINLIB_EXPORT_CLASS(velodyne_pointcloud::TransformNodelet, nodelet::Nodelet)