diff --git a/CHANGELOG.md b/CHANGELOG.md index 22a485e39..20a407cf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo ## [Unreleased] +## [4.1.1] - 2022-01-13 + +### Fixed +- Fix compilation against Gazebo 11.10.0 (https://github.com/robotology/gazebo-yarp-plugins/pull/605, https://github.com/robotology/gazebo-yarp-plugins/issues/606). + ## [4.1.0] - 2021-12-23 ### Changed diff --git a/CMakeLists.txt b/CMakeLists.txt index e35194d88..ceafdbd79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ option(GAZEBO_YARP_PLUGINS_DISABLE_IMPLICIT_NETWORK_WRAPPERS "if enabled removes # Project version set(${PROJECT_NAME}_MAJOR_VERSION 4) set(${PROJECT_NAME}_MINOR_VERSION 1) -set(${PROJECT_NAME}_PATCH_VERSION 0) +set(${PROJECT_NAME}_PATCH_VERSION 1) set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION}) @@ -114,5 +114,3 @@ endif() # add a dox target to generate doxygen documentation add_subdirectory(doc) - - diff --git a/plugins/basestate/src/BaseStateDriver.cpp b/plugins/basestate/src/BaseStateDriver.cpp index a5c8dc72a..474b4615d 100644 --- a/plugins/basestate/src/BaseStateDriver.cpp +++ b/plugins/basestate/src/BaseStateDriver.cpp @@ -64,6 +64,7 @@ bool GazeboYarpBaseStateDriver::open(yarp::os::Searchable& config) m_baseState.resize(m_stateDimensions); + using namespace boost::placeholders; m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpBaseStateDriver::onUpdate, this, _1)); return true; diff --git a/plugins/camera/src/CameraDriver.cpp b/plugins/camera/src/CameraDriver.cpp index 1100a770f..454f56395 100644 --- a/plugins/camera/src/CameraDriver.cpp +++ b/plugins/camera/src/CameraDriver.cpp @@ -131,6 +131,7 @@ bool GazeboYarpCameraDriver::open(yarp::os::Searchable& config) } //Connect the driver to the gazebo simulation + using namespace boost::placeholders; this->m_updateConnection = m_camera->ConnectNewImageFrame(boost::bind(&GazeboYarpCameraDriver::captureImage, this, _1, _2, _3, _4, _5)); return true; } diff --git a/plugins/clock/src/Clock.cc b/plugins/clock/src/Clock.cc index 59e59cd79..5a1b6b054 100644 --- a/plugins/clock/src/Clock.cc +++ b/plugins/clock/src/Clock.cc @@ -104,6 +104,7 @@ namespace gazebo yInfo() << "GazeboYarpClock loaded. Clock port will be " << m_portName; //The proper loading is done when the world is created + using namespace boost::placeholders; m_worldCreatedEvent = gazebo::event::Events::ConnectWorldCreated(boost::bind(&GazeboYarpClock::gazeboYarpClockLoad,this,_1)); } @@ -153,7 +154,7 @@ namespace gazebo //Getting world pointer m_world = gazebo::physics::get_world(world_name); - + using namespace boost::placeholders; m_timeUpdateEvent = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpClock::clockUpdate,this)); } diff --git a/plugins/contactloadcellarray/src/ContactLoadCellArrayDriver.cpp b/plugins/contactloadcellarray/src/ContactLoadCellArrayDriver.cpp index e24e2482d..d0867040c 100644 --- a/plugins/contactloadcellarray/src/ContactLoadCellArrayDriver.cpp +++ b/plugins/contactloadcellarray/src/ContactLoadCellArrayDriver.cpp @@ -201,7 +201,7 @@ bool GazeboYarpContactLoadCellArrayDriver::open(yarp::os::Searchable& config) } std::lock_guard guard(m_dataMutex); - + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpContactLoadCellArrayDriver::onUpdate, this, _1)); this->m_sensor->SetActive(true); diff --git a/plugins/controlboard/src/ControlBoardDriver.cpp b/plugins/controlboard/src/ControlBoardDriver.cpp index 106e8b37c..62acef69c 100644 --- a/plugins/controlboard/src/ControlBoardDriver.cpp +++ b/plugins/controlboard/src/ControlBoardDriver.cpp @@ -387,6 +387,7 @@ bool GazeboYarpControlBoardDriver::gazebo_init() } // Connect the onUpdate method to the WorldUpdateBegin event callback + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpControlBoardDriver::onUpdate, this, _1)); diff --git a/plugins/depthCamera/src/DepthCameraDriver.cpp b/plugins/depthCamera/src/DepthCameraDriver.cpp index d7900c8dc..ff8fabe9a 100644 --- a/plugins/depthCamera/src/DepthCameraDriver.cpp +++ b/plugins/depthCamera/src/DepthCameraDriver.cpp @@ -107,6 +107,7 @@ bool GazeboYarpDepthCameraDriver::open(yarp::os::Searchable &config) } //Connect the driver to the gazebo simulation + using namespace boost::placeholders; auto imageConnectionBind = boost::bind(&GazeboYarpDepthCameraDriver::OnNewImageFrame, this, _1, _2, _3, _4, _5); auto depthConnectionBind = boost::bind(&GazeboYarpDepthCameraDriver::OnNewDepthFrame, this, _1, _2, _3, _4, _5); diff --git a/plugins/externalwrench/src/ApplyExternalWrench.cc b/plugins/externalwrench/src/ApplyExternalWrench.cc index d534724e4..2c9e7bdfb 100644 --- a/plugins/externalwrench/src/ApplyExternalWrench.cc +++ b/plugins/externalwrench/src/ApplyExternalWrench.cc @@ -66,6 +66,7 @@ void ApplyExternalWrench::Load ( physics::ModelPtr _model, sdf::ElementPtr _sdf // Listen to the update event. This event is broadcast every // simulation iteration. + using namespace boost::placeholders; this->m_updateConnection = event::Events::ConnectWorldUpdateBegin ( boost::bind ( &ApplyExternalWrench::onUpdate, this, _1 ) ); // Listen to gazebo world reset event diff --git a/plugins/fakecontrolboard/src/FakeControlBoardDriver.cpp b/plugins/fakecontrolboard/src/FakeControlBoardDriver.cpp index c06f9df81..4c8c29a23 100644 --- a/plugins/fakecontrolboard/src/FakeControlBoardDriver.cpp +++ b/plugins/fakecontrolboard/src/FakeControlBoardDriver.cpp @@ -58,6 +58,7 @@ bool GazeboYarpFakeControlBoardDriver::open(yarp::os::Searchable& config) m_controlMode.resize(m_numberOfJoints,VOCAB_CM_NOT_CONFIGURED); m_interactionMode.resize(m_numberOfJoints,VOCAB_IM_STIFF); + using namespace boost::placeholders; m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpFakeControlBoardDriver::onUpdate, this, _1)); diff --git a/plugins/forcetorque/src/ForceTorqueDriver.cpp b/plugins/forcetorque/src/ForceTorqueDriver.cpp index 21696e18b..6f4afb65d 100644 --- a/plugins/forcetorque/src/ForceTorqueDriver.cpp +++ b/plugins/forcetorque/src/ForceTorqueDriver.cpp @@ -72,6 +72,7 @@ bool GazeboYarpForceTorqueDriver::open(yarp::os::Searchable& config) } //Connect the driver to the gazebo simulation + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpForceTorqueDriver::onUpdate, this, _1)); return true; diff --git a/plugins/imu/src/IMUDriver.cpp b/plugins/imu/src/IMUDriver.cpp index 52f57ed1b..aa1bcb285 100644 --- a/plugins/imu/src/IMUDriver.cpp +++ b/plugins/imu/src/IMUDriver.cpp @@ -89,6 +89,7 @@ bool GazeboYarpIMUDriver::open(yarp::os::Searchable& config) } //Connect the driver to the gazebo simulation + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpIMUDriver::onUpdate, this, _1)); return true; diff --git a/plugins/inertialmtbPart/src/inertialMTBPartDriver.cpp b/plugins/inertialmtbPart/src/inertialMTBPartDriver.cpp index 9f6dd7e4e..5568530e9 100644 --- a/plugins/inertialmtbPart/src/inertialMTBPartDriver.cpp +++ b/plugins/inertialmtbPart/src/inertialMTBPartDriver.cpp @@ -118,6 +118,7 @@ bool GazeboYarpInertialMTBPartDriver::open(yarp::os::Searchable& config) buildOutBufferFixedData(robotPart,enabledSensors); //Connect the driver to the gazebo simulation + using namespace boost::placeholders; m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpInertialMTBPartDriver::onUpdate, this, _1)); return true; diff --git a/plugins/lasersensor/src/LaserSensorDriver.cpp b/plugins/lasersensor/src/LaserSensorDriver.cpp index 748ab9f31..d6addd594 100644 --- a/plugins/lasersensor/src/LaserSensorDriver.cpp +++ b/plugins/lasersensor/src/LaserSensorDriver.cpp @@ -75,6 +75,7 @@ bool GazeboYarpLaserSensorDriver::open(yarp::os::Searchable& config) } //Connect the driver to the gazebo simulation + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpLaserSensorDriver::onUpdate, this, _1)); //this block of parameters is obtained from gazebo diff --git a/plugins/maissensor/src/MaisSensorDriver.cpp b/plugins/maissensor/src/MaisSensorDriver.cpp index e9f927e3e..5c02975a8 100644 --- a/plugins/maissensor/src/MaisSensorDriver.cpp +++ b/plugins/maissensor/src/MaisSensorDriver.cpp @@ -78,6 +78,7 @@ bool GazeboYarpMaisSensorDriver::gazebo_init() configureJointsLimits(); + using namespace boost::placeholders; this->m_updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin(boost::bind(&GazeboYarpMaisSensorDriver::onUpdate, this, _1)); m_gazeboNode = gazebo::transport::NodePtr(new gazebo::transport::Node); diff --git a/plugins/multicamera/src/MultiCameraDriver.cpp b/plugins/multicamera/src/MultiCameraDriver.cpp index dec089d30..8dd3c6902 100644 --- a/plugins/multicamera/src/MultiCameraDriver.cpp +++ b/plugins/multicamera/src/MultiCameraDriver.cpp @@ -126,6 +126,7 @@ bool yarp::dev::GazeboYarpMultiCameraDriver::open(yarp::os::Searchable& config) } // Connect all the cameras only when everything is set up + using namespace boost::placeholders; for (unsigned int i = 0; i < m_camera_count; ++i) { this->m_updateConnection.push_back(this->m_camera[i]->ConnectNewImageFrame(boost::bind(&yarp::dev::GazeboYarpMultiCameraDriver::captureImage, this, i, _1, _2, _3, _4, _5))); } diff --git a/plugins/multicamera/src/MultiCameraPlugin.cpp b/plugins/multicamera/src/MultiCameraPlugin.cpp index baa3e310b..61bc04de9 100644 --- a/plugins/multicamera/src/MultiCameraPlugin.cpp +++ b/plugins/multicamera/src/MultiCameraPlugin.cpp @@ -77,6 +77,7 @@ void MultiCameraPlugin::Load(sensors::SensorPtr _sensor, std::string cameraName = this->parentSensor->Camera(i)->Name(); // gzdbg << "camera(" << i << ") name [" << cameraName << "]\n"; + using namespace boost::placeholders; // FIXME: hardcoded 2 camera support only if (cameraName.find("left") != std::string::npos) diff --git a/plugins/showmodelcom/src/ShowModelCoM.cc b/plugins/showmodelcom/src/ShowModelCoM.cc index f10f425c2..e5a7f6305 100644 --- a/plugins/showmodelcom/src/ShowModelCoM.cc +++ b/plugins/showmodelcom/src/ShowModelCoM.cc @@ -130,6 +130,7 @@ namespace gazebo // Listen to the update event. This event is broadcast every // simulation iteration. + this->m_updateConnection = event::Events::ConnectWorldUpdateBegin ( boost::bind ( &ShowModelCoM::UpdateChild, this ) ); } } diff --git a/plugins/worldinterface/src/worldinterface.cpp b/plugins/worldinterface/src/worldinterface.cpp index 5d82243bc..b1979c782 100644 --- a/plugins/worldinterface/src/worldinterface.cpp +++ b/plugins/worldinterface/src/worldinterface.cpp @@ -87,6 +87,7 @@ void WorldInterface::Load(physics::ModelPtr _model, sdf::ElementPtr _sdf) // Listen to the update event. This event is broadcast every // simulation iteration. + using namespace boost::placeholders; this->updateConnection = event::Events::ConnectWorldUpdateBegin( boost::bind(&WorldInterface::OnUpdate, this, _1));