Skip to content

Commit 270aaa8

Browse files
authored
[ROS-O] do not forward-declare Ogre types (#84)
* do not forward-declare Ogre types In current Ogre these are actually typedef's and compilers complain about an incongruent forward-declaration. Also, there is no reason not to include the designated header here. * replace obsolete use of boost _1
1 parent fc4b166 commit 270aaa8

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

interactive_marker_tutorials/src/pong.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,13 @@ class PongGame
388388
int_marker.name = "paddle0";
389389
int_marker.pose.position.x = -PLAYER_X;
390390
server_.insert( int_marker );
391-
server_.setCallback( int_marker.name, boost::bind( &PongGame::processPaddleFeedback, this, 0, _1 ) );
391+
server_.setCallback( int_marker.name, [this](auto feedback){ processPaddleFeedback(0, feedback); } );
392392

393393
// Control for player 2
394394
int_marker.name = "paddle1";
395395
int_marker.pose.position.x = PLAYER_X;
396396
server_.insert( int_marker );
397-
server_.setCallback( int_marker.name, boost::bind( &PongGame::processPaddleFeedback, this, 1, _1 ) );
397+
server_.setCallback( int_marker.name, [this](auto feedback){ processPaddleFeedback(1, feedback); } );
398398

399399
// Make display markers
400400
marker.scale.x = BORDER_SIZE;

interactive_marker_tutorials/src/selection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class PointCouldSelector
246246
interactive_markers::makeArrow( int_marker, control, 0.5 * sign );
247247

248248
int_marker.controls.push_back( control );
249-
server_->insert( int_marker, boost::bind( &PointCouldSelector::processAxisFeedback, this, _1 ) );
249+
server_->insert( int_marker, [this](auto feedback){ processAxisFeedback(feedback); } );
250250
}
251251
}
252252
}

rviz_plugin_tutorials/src/imu_visual.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@
3131
#define IMU_VISUAL_H
3232

3333
#include <sensor_msgs/Imu.h>
34-
35-
namespace Ogre
36-
{
37-
class Vector3;
38-
class Quaternion;
39-
}
34+
#include <OgrePrerequisites.h>
4035

4136
namespace rviz
4237
{

rviz_plugin_tutorials/src/plant_flag_tool.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@
3030
#define PLANT_FLAG_TOOL_H
3131

3232
#include <rviz/tool.h>
33-
34-
namespace Ogre
35-
{
36-
class SceneNode;
37-
class Vector3;
38-
}
33+
#include <OgrePrerequisites.h>
3934

4035
namespace rviz
4136
{

0 commit comments

Comments
 (0)