From 6a8bc3a37ff82d383bd28cd4d8d764d46413a0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Thu, 30 Jul 2020 15:10:58 +0200 Subject: [PATCH 1/8] Added using namespace boost::placeholders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- gazebo/gui/model/ModelTreeWidget.cc | 1 + gazebo/gui/model/SchematicViewWidget.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/gazebo/gui/model/ModelTreeWidget.cc b/gazebo/gui/model/ModelTreeWidget.cc index 860b930a5f..8b225d3110 100644 --- a/gazebo/gui/model/ModelTreeWidget.cc +++ b/gazebo/gui/model/ModelTreeWidget.cc @@ -22,6 +22,7 @@ #include "gazebo/gui/model/ModelPluginInspector.hh" #include "gazebo/gui/model/ModelTreeWidget.hh" +using namespace boost::placeholders; using namespace gazebo; using namespace gui; diff --git a/gazebo/gui/model/SchematicViewWidget.cc b/gazebo/gui/model/SchematicViewWidget.cc index 957a41f64b..e37e63fa8e 100644 --- a/gazebo/gui/model/SchematicViewWidget.cc +++ b/gazebo/gui/model/SchematicViewWidget.cc @@ -30,6 +30,7 @@ #include "gazebo/gui/model/ModelEditorEvents.hh" #include "gazebo/gui/model/SchematicViewWidget.hh" +using namespace boost::placeholders; using namespace gazebo; using namespace gui; From 95ef73684a508c4201fb38332bfc8b7e8d7ebe8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Thu, 30 Jul 2020 16:45:05 +0200 Subject: [PATCH 2/8] using namespace boost::placeholders; only on macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- gazebo/gui/model/ModelTreeWidget.cc | 2 ++ gazebo/gui/model/SchematicViewWidget.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gazebo/gui/model/ModelTreeWidget.cc b/gazebo/gui/model/ModelTreeWidget.cc index 8b225d3110..2a480e50a3 100644 --- a/gazebo/gui/model/ModelTreeWidget.cc +++ b/gazebo/gui/model/ModelTreeWidget.cc @@ -22,7 +22,9 @@ #include "gazebo/gui/model/ModelPluginInspector.hh" #include "gazebo/gui/model/ModelTreeWidget.hh" +#ifdef __APPLE__ using namespace boost::placeholders; +#endif using namespace gazebo; using namespace gui; diff --git a/gazebo/gui/model/SchematicViewWidget.cc b/gazebo/gui/model/SchematicViewWidget.cc index e37e63fa8e..77916a8966 100644 --- a/gazebo/gui/model/SchematicViewWidget.cc +++ b/gazebo/gui/model/SchematicViewWidget.cc @@ -30,7 +30,9 @@ #include "gazebo/gui/model/ModelEditorEvents.hh" #include "gazebo/gui/model/SchematicViewWidget.hh" +#ifdef __APPLE__ using namespace boost::placeholders; +#endif using namespace gazebo; using namespace gui; From d48705933c826d2330d3417949fb71f9d61d632a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Fri, 31 Jul 2020 09:34:38 +0200 Subject: [PATCH 3/8] Fixed test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- test/plugins/ForceTorqueModelRemovalTestPlugin.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc index 70d7d9ddbb..45769c0c20 100644 --- a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc +++ b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc @@ -19,7 +19,9 @@ #include "gazebo/sensors/ForceTorqueSensor.hh" - +#ifdef __APPLE__ +using namespace boost::placeholders; +#endif using namespace gazebo; GZ_REGISTER_SENSOR_PLUGIN(ForceTorqueModelRemovalTestPlugin) From 169402ca641a535aba35f5a191455ad2e03135e0 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 31 Jul 2020 16:35:25 +0200 Subject: [PATCH 4/8] Fixed custom main example Signed-off-by: ahcorde --- examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt b/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt index c99ca11eae..6fdaf1b378 100644 --- a/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt +++ b/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt @@ -12,3 +12,5 @@ link_directories(${GAZEBO_LIBRARY_DIRS}) add_executable(custom_main custom_main.cc) target_link_libraries(custom_main ${GAZEBO_LIBRARIES}) + +target_link_directories(custom_main PUBLIC ${Boost_LIBRARY_DIRS}) From 16f1581f00b5c3c32e4a0eea1e83ae87ac22cf58 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 7 Aug 2020 17:10:47 -0700 Subject: [PATCH 5/8] namespace on all platforms Signed-off-by: Louise Poubel --- gazebo/gui/model/ModelTreeWidget.cc | 2 -- gazebo/gui/model/SchematicViewWidget.cc | 2 -- test/plugins/ForceTorqueModelRemovalTestPlugin.cc | 2 -- 3 files changed, 6 deletions(-) diff --git a/gazebo/gui/model/ModelTreeWidget.cc b/gazebo/gui/model/ModelTreeWidget.cc index 2a480e50a3..8b225d3110 100644 --- a/gazebo/gui/model/ModelTreeWidget.cc +++ b/gazebo/gui/model/ModelTreeWidget.cc @@ -22,9 +22,7 @@ #include "gazebo/gui/model/ModelPluginInspector.hh" #include "gazebo/gui/model/ModelTreeWidget.hh" -#ifdef __APPLE__ using namespace boost::placeholders; -#endif using namespace gazebo; using namespace gui; diff --git a/gazebo/gui/model/SchematicViewWidget.cc b/gazebo/gui/model/SchematicViewWidget.cc index 77916a8966..e37e63fa8e 100644 --- a/gazebo/gui/model/SchematicViewWidget.cc +++ b/gazebo/gui/model/SchematicViewWidget.cc @@ -30,9 +30,7 @@ #include "gazebo/gui/model/ModelEditorEvents.hh" #include "gazebo/gui/model/SchematicViewWidget.hh" -#ifdef __APPLE__ using namespace boost::placeholders; -#endif using namespace gazebo; using namespace gui; diff --git a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc index 45769c0c20..620db5a7d6 100644 --- a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc +++ b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc @@ -19,9 +19,7 @@ #include "gazebo/sensors/ForceTorqueSensor.hh" -#ifdef __APPLE__ using namespace boost::placeholders; -#endif using namespace gazebo; GZ_REGISTER_SENSOR_PLUGIN(ForceTorqueModelRemovalTestPlugin) From 5d3d06e861ed687b7a680ce4af53dd870b4ee3ff Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 8 Aug 2020 08:22:31 -0700 Subject: [PATCH 6/8] Use std::bind and scoped using statement boost::bind changed its syntax for the placeholders, so just switch to std::bind and add a scoped using namespace std::placeholders to reduce the size of the diff. Signed-off-by: Steve Peters --- gazebo/gui/model/ModelTreeWidget.cc | 37 ++++++++++--------- gazebo/gui/model/SchematicViewWidget.cc | 21 ++++++----- .../ForceTorqueModelRemovalTestPlugin.cc | 7 +++- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/gazebo/gui/model/ModelTreeWidget.cc b/gazebo/gui/model/ModelTreeWidget.cc index 8b225d3110..1a5b1fae09 100644 --- a/gazebo/gui/model/ModelTreeWidget.cc +++ b/gazebo/gui/model/ModelTreeWidget.cc @@ -15,6 +15,8 @@ * */ +#include + #include "gazebo/common/Events.hh" #include "gazebo/gui/GuiEvents.hh" @@ -22,7 +24,6 @@ #include "gazebo/gui/model/ModelPluginInspector.hh" #include "gazebo/gui/model/ModelTreeWidget.hh" -using namespace boost::placeholders; using namespace gazebo; using namespace gui; @@ -161,21 +162,23 @@ ModelTreeWidget::ModelTreeWidget(QWidget *_parent) this->layout()->setContentsMargins(0, 0, 0, 0); // Connections + using namespace std::placeholders; + this->connections.push_back( gui::model::Events::ConnectSaveModel( - boost::bind(&ModelTreeWidget::OnSaveModel, this, _1))); + std::bind(&ModelTreeWidget::OnSaveModel, this, _1))); this->connections.push_back( gui::model::Events::ConnectNewModel( - boost::bind(&ModelTreeWidget::OnNewModel, this))); + std::bind(&ModelTreeWidget::OnNewModel, this))); this->connections.push_back( gui::model::Events::ConnectModelPropertiesChanged( - boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2))); + std::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectModelNameChanged( - boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1))); + std::bind(&ModelTreeWidget::OnModelNameChanged, this, _1))); this->connections.push_back( gui::model::Events::ConnectNestedModelInserted( @@ -184,51 +187,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget *_parent) this->connections.push_back( gui::model::Events::ConnectLinkInserted( - boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1))); + std::bind(&ModelTreeWidget::OnLinkInserted, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointInserted( - boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4))); + std::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4))); this->connections.push_back( gui::model::Events::ConnectModelPluginInserted( - boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1))); + std::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1))); this->connections.push_back( gui::model::Events::ConnectNestedModelRemoved( - boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1))); + std::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectLinkRemoved( - boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1))); + std::bind(&ModelTreeWidget::OnLinkRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointRemoved( - boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1))); + std::bind(&ModelTreeWidget::OnJointRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectModelPluginRemoved( - boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1))); + std::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointNameChanged( - boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2))); + std::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2))); this->connections.push_back( event::Events::ConnectSetSelectedEntity( - boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2))); + std::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedEntity( - boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2))); + std::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedJoint( - boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2))); + std::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedModelPlugin( - boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2))); + std::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2))); this->ClearModelTree(); } diff --git a/gazebo/gui/model/SchematicViewWidget.cc b/gazebo/gui/model/SchematicViewWidget.cc index e37e63fa8e..52ee68fb98 100644 --- a/gazebo/gui/model/SchematicViewWidget.cc +++ b/gazebo/gui/model/SchematicViewWidget.cc @@ -15,6 +15,8 @@ * */ +#include + #include #include "gazebo/rendering/Material.hh" @@ -30,7 +32,6 @@ #include "gazebo/gui/model/ModelEditorEvents.hh" #include "gazebo/gui/model/SchematicViewWidget.hh" -using namespace boost::placeholders; using namespace gazebo; using namespace gui; @@ -83,32 +84,34 @@ void SchematicViewWidget::Reset() ///////////////////////////////////////////////// void SchematicViewWidget::Init() { + using namespace std::placeholders; + this->connections.push_back(gui::model::Events::ConnectLinkInserted( - boost::bind(&SchematicViewWidget::AddNode, this, _1))); + std::bind(&SchematicViewWidget::AddNode, this, _1))); this->connections.push_back(gui::model::Events::ConnectLinkRemoved( - boost::bind(&SchematicViewWidget::RemoveNode, this, _1))); + std::bind(&SchematicViewWidget::RemoveNode, this, _1))); this->connections.push_back(gui::model::Events::ConnectJointInserted( - boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5))); + std::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5))); this->connections.push_back(gui::model::Events::ConnectJointRemoved( - boost::bind(&SchematicViewWidget::RemoveEdge, this, _1))); + std::bind(&SchematicViewWidget::RemoveEdge, this, _1))); this->connections.push_back(gui::model::Events::ConnectJointChanged( - boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5))); + std::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5))); this->connections.push_back( event::Events::ConnectSetSelectedEntity( - boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2))); + std::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedEntity( - boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2))); + std::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedJoint( - boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2))); + std::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2))); } ///////////////////////////////////////////////// diff --git a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc index 620db5a7d6..6cccd943b8 100644 --- a/test/plugins/ForceTorqueModelRemovalTestPlugin.cc +++ b/test/plugins/ForceTorqueModelRemovalTestPlugin.cc @@ -15,11 +15,13 @@ * */ +#include + #include "plugins/ForceTorqueModelRemovalTestPlugin.hh" #include "gazebo/sensors/ForceTorqueSensor.hh" -using namespace boost::placeholders; + using namespace gazebo; GZ_REGISTER_SENSOR_PLUGIN(ForceTorqueModelRemovalTestPlugin) @@ -53,7 +55,8 @@ void ForceTorqueModelRemovalTestPlugin::Load(sensors::SensorPtr _sensor, // Create connection this->updateConnection = gazebo::event::Events::ConnectWorldUpdateBegin( - boost::bind(&ForceTorqueModelRemovalTestPlugin::onUpdate, this, _1)); + std::bind(&ForceTorqueModelRemovalTestPlugin::onUpdate, this, + std::placeholders::_1)); } void ForceTorqueModelRemovalTestPlugin::onUpdate( From fd718ac5d22bb3d516eb263a1ab7d9e12d0f695c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sat, 8 Aug 2020 15:45:55 -0700 Subject: [PATCH 7/8] Use boost namespace if version >= 1.73 Revert the previous change to std::bind. Signed-off-by: Steve Peters --- gazebo/gui/model/ModelTreeWidget.cc | 38 +++++++++++++------------ gazebo/gui/model/SchematicViewWidget.cc | 22 +++++++------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/gazebo/gui/model/ModelTreeWidget.cc b/gazebo/gui/model/ModelTreeWidget.cc index 1a5b1fae09..14f52ca4cb 100644 --- a/gazebo/gui/model/ModelTreeWidget.cc +++ b/gazebo/gui/model/ModelTreeWidget.cc @@ -15,7 +15,7 @@ * */ -#include +#include #include "gazebo/common/Events.hh" @@ -162,23 +162,25 @@ ModelTreeWidget::ModelTreeWidget(QWidget *_parent) this->layout()->setContentsMargins(0, 0, 0, 0); // Connections - using namespace std::placeholders; + #if BOOST_VERSION >= 107300 + using namespace boost::placeholders; + #endif this->connections.push_back( gui::model::Events::ConnectSaveModel( - std::bind(&ModelTreeWidget::OnSaveModel, this, _1))); + boost::bind(&ModelTreeWidget::OnSaveModel, this, _1))); this->connections.push_back( gui::model::Events::ConnectNewModel( - std::bind(&ModelTreeWidget::OnNewModel, this))); + boost::bind(&ModelTreeWidget::OnNewModel, this))); this->connections.push_back( gui::model::Events::ConnectModelPropertiesChanged( - std::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectModelNameChanged( - std::bind(&ModelTreeWidget::OnModelNameChanged, this, _1))); + boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1))); this->connections.push_back( gui::model::Events::ConnectNestedModelInserted( @@ -187,51 +189,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget *_parent) this->connections.push_back( gui::model::Events::ConnectLinkInserted( - std::bind(&ModelTreeWidget::OnLinkInserted, this, _1))); + boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointInserted( - std::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4))); + boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4))); this->connections.push_back( gui::model::Events::ConnectModelPluginInserted( - std::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1))); + boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1))); this->connections.push_back( gui::model::Events::ConnectNestedModelRemoved( - std::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1))); + boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectLinkRemoved( - std::bind(&ModelTreeWidget::OnLinkRemoved, this, _1))); + boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointRemoved( - std::bind(&ModelTreeWidget::OnJointRemoved, this, _1))); + boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectModelPluginRemoved( - std::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1))); + boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1))); this->connections.push_back( gui::model::Events::ConnectJointNameChanged( - std::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2))); this->connections.push_back( event::Events::ConnectSetSelectedEntity( - std::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedEntity( - std::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedJoint( - std::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedModelPlugin( - std::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2))); + boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2))); this->ClearModelTree(); } diff --git a/gazebo/gui/model/SchematicViewWidget.cc b/gazebo/gui/model/SchematicViewWidget.cc index 52ee68fb98..8a40be569e 100644 --- a/gazebo/gui/model/SchematicViewWidget.cc +++ b/gazebo/gui/model/SchematicViewWidget.cc @@ -15,7 +15,7 @@ * */ -#include +#include #include @@ -84,34 +84,36 @@ void SchematicViewWidget::Reset() ///////////////////////////////////////////////// void SchematicViewWidget::Init() { - using namespace std::placeholders; + #if BOOST_VERSION >= 107300 + using namespace boost::placeholders; + #endif this->connections.push_back(gui::model::Events::ConnectLinkInserted( - std::bind(&SchematicViewWidget::AddNode, this, _1))); + boost::bind(&SchematicViewWidget::AddNode, this, _1))); this->connections.push_back(gui::model::Events::ConnectLinkRemoved( - std::bind(&SchematicViewWidget::RemoveNode, this, _1))); + boost::bind(&SchematicViewWidget::RemoveNode, this, _1))); this->connections.push_back(gui::model::Events::ConnectJointInserted( - std::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5))); + boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5))); this->connections.push_back(gui::model::Events::ConnectJointRemoved( - std::bind(&SchematicViewWidget::RemoveEdge, this, _1))); + boost::bind(&SchematicViewWidget::RemoveEdge, this, _1))); this->connections.push_back(gui::model::Events::ConnectJointChanged( - std::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5))); + boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5))); this->connections.push_back( event::Events::ConnectSetSelectedEntity( - std::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2))); + boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedEntity( - std::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2))); + boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2))); this->connections.push_back( gui::model::Events::ConnectSetSelectedJoint( - std::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2))); + boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2))); } ///////////////////////////////////////////////// From cb26a9783b0b31efbe60904d4d1165eea2198950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 10 Aug 2020 22:36:02 +0200 Subject: [PATCH 8/8] Update examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Co-authored-by: Jose Luis Rivero --- examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt b/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt index 6fdaf1b378..3b53c22df5 100644 --- a/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt +++ b/examples/stand_alone/custom_main_pkgconfig/CMakeLists.txt @@ -13,4 +13,8 @@ link_directories(${GAZEBO_LIBRARY_DIRS}) add_executable(custom_main custom_main.cc) target_link_libraries(custom_main ${GAZEBO_LIBRARIES}) -target_link_directories(custom_main PUBLIC ${Boost_LIBRARY_DIRS}) +if(${CMAKE_VERSION} VERSION_LESS "3.13.0") + link_directories(${Boost_LIBRARY_DIRS}) +else() + target_link_directories(custom_main PUBLIC ${Boost_LIBRARY_DIRS}) +endif()