Skip to content

[ROS-O] do not forward-declare Ogre types #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sloretz merged 2 commits into from
Apr 23, 2025
Merged

[ROS-O] do not forward-declare Ogre types #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2650463
do not forward-declare Ogre types
v4hn Oct 4, 2022
2a1b3c1
replace obsolete use of boost _1
v4hn Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions interactive_marker_tutorials/src/pong.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,13 @@ class PongGame
int_marker.name = "paddle0";
int_marker.pose.position.x = -PLAYER_X;
server_.insert( int_marker );
server_.setCallback( int_marker.name, boost::bind( &PongGame::processPaddleFeedback, this, 0, _1 ) );
server_.setCallback( int_marker.name, [this](auto feedback){ processPaddleFeedback(0, feedback); } );

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

// Make display markers
marker.scale.x = BORDER_SIZE;
Expand Down
2 changes: 1 addition & 1 deletion interactive_marker_tutorials/src/selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class PointCouldSelector
interactive_markers::makeArrow( int_marker, control, 0.5 * sign );

int_marker.controls.push_back( control );
server_->insert( int_marker, boost::bind( &PointCouldSelector::processAxisFeedback, this, _1 ) );
server_->insert( int_marker, [this](auto feedback){ processAxisFeedback(feedback); } );
}
}
}
Expand Down
7 changes: 1 addition & 6 deletions rviz_plugin_tutorials/src/imu_visual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@
#define IMU_VISUAL_H

#include <sensor_msgs/Imu.h>

namespace Ogre
{
class Vector3;
class Quaternion;
}
#include <OgrePrerequisites.h>

namespace rviz
{
Expand Down
7 changes: 1 addition & 6 deletions rviz_plugin_tutorials/src/plant_flag_tool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@
#define PLANT_FLAG_TOOL_H

#include <rviz/tool.h>

namespace Ogre
{
class SceneNode;
class Vector3;
}
#include <OgrePrerequisites.h>

namespace rviz
{
Expand Down