From 462a93ccd6357553de78daaa52b6e354c1950a65 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Aug 08 2020 23:48:16 +0000 Subject: Add boost placeholders to fix tests --- diff --git a/gazebo-10.1.0-boost173.patch b/gazebo-10.1.0-boost173.patch index 4c18d0d..a81213e 100644 --- a/gazebo-10.1.0-boost173.patch +++ b/gazebo-10.1.0-boost173.patch @@ -1,6 +1,6 @@ diff -up ./gazebo/gui/model/ModelTreeWidget.cc.boost173 ./gazebo/gui/model/ModelTreeWidget.cc ---- ./gazebo/gui/model/ModelTreeWidget.cc.boost173 2020-06-15 19:28:14.617584849 -0400 -+++ ./gazebo/gui/model/ModelTreeWidget.cc 2020-06-15 19:29:09.138183961 -0400 +--- ./gazebo/gui/model/ModelTreeWidget.cc.boost173 2019-03-28 20:58:32.000000000 -0400 ++++ ./gazebo/gui/model/ModelTreeWidget.cc 2020-08-08 17:36:39.397952859 -0400 @@ -24,6 +24,7 @@ using namespace gazebo; @@ -10,8 +10,8 @@ diff -up ./gazebo/gui/model/ModelTreeWidget.cc.boost173 ./gazebo/gui/model/Model ///////////////////////////////////////////////// ModelTreeWidget::ModelTreeWidget(QWidget *_parent) diff -up ./gazebo/gui/model/SchematicViewWidget.cc.boost173 ./gazebo/gui/model/SchematicViewWidget.cc ---- ./gazebo/gui/model/SchematicViewWidget.cc.boost173 2020-06-15 19:28:49.889325538 -0400 -+++ ./gazebo/gui/model/SchematicViewWidget.cc 2020-06-15 19:29:28.198042918 -0400 +--- ./gazebo/gui/model/SchematicViewWidget.cc.boost173 2019-03-28 20:58:32.000000000 -0400 ++++ ./gazebo/gui/model/SchematicViewWidget.cc 2020-08-08 17:36:39.397952859 -0400 @@ -32,6 +32,7 @@ using namespace gazebo; @@ -20,3 +20,25 @@ diff -up ./gazebo/gui/model/SchematicViewWidget.cc.boost173 ./gazebo/gui/model/S ///////////////////////////////////////////////// SchematicViewWidget::SchematicViewWidget(QWidget *_parent) +diff -up ./test/integration/model_database.cc.boost173 ./test/integration/model_database.cc +--- ./test/integration/model_database.cc.boost173 2020-08-08 19:45:51.176525049 -0400 ++++ ./test/integration/model_database.cc 2020-08-08 19:46:29.983287693 -0400 +@@ -20,6 +20,7 @@ + #include "test_config.h" + + using namespace gazebo; ++using namespace boost::placeholders; + + int g_onModels = 0; + int g_onModels1 = 0; +diff -up ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc.boost173 ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc +--- ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc.boost173 2020-08-08 19:47:14.683014303 -0400 ++++ ./test/plugins/ForceTorqueModelRemovalTestPlugin.cc 2020-08-08 19:47:22.041969295 -0400 +@@ -21,6 +21,7 @@ + + + using namespace gazebo; ++using namespace boost::placeholders; + + GZ_REGISTER_SENSOR_PLUGIN(ForceTorqueModelRemovalTestPlugin) +