From cd23e3a0f8dc07a5ddec88dee1cb84a86ed3875e Mon Sep 17 00:00:00 2001
From: Kevin Allen <kma1660@gmail.com>
Date: Fri, 8 Jun 2018 06:50:08 -0700
Subject: [PATCH] Fix melodic compiler warnings (#744)

* Fix model_state_test. -v means --version not --verbose (#710)

* fix gazebo9 warnings by removing Set.*Accel calls (#728)

* fix gazebo9 warnings by removing Set.*Accel calls

* gazebo_plugins: don't use -r in tests
---
 gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp             | 4 ----
 gazebo_plugins/test/camera/camera.test                       | 2 +-
 gazebo_plugins/test/camera/depth_camera.test                 | 2 +-
 gazebo_plugins/test/camera/multicamera.test                  | 2 +-
 .../test/set_model_state_test/set_model_state_test.test      | 5 ++---
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp b/gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp
index b79c76c2f..fee4d3822 100644
--- a/gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp
+++ b/gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp
@@ -203,13 +203,9 @@ void GazeboRosVacuumGripper::UpdateChild()
       double norm = diff.Pos().Length();
       if (norm < 0.05) {
 #if GAZEBO_MAJOR_VERSION >= 8
-        links[j]->SetLinearAccel(link_->WorldLinearAccel());
-        links[j]->SetAngularAccel(link_->WorldAngularAccel());
         links[j]->SetLinearVel(link_->WorldLinearVel());
         links[j]->SetAngularVel(link_->WorldAngularVel());
 #else
-        links[j]->SetLinearAccel(link_->GetWorldLinearAccel());
-        links[j]->SetAngularAccel(link_->GetWorldAngularAccel());
         links[j]->SetLinearVel(link_->GetWorldLinearVel());
         links[j]->SetAngularVel(link_->GetWorldAngularVel());
 #endif
diff --git a/gazebo_plugins/test/camera/camera.test b/gazebo_plugins/test/camera/camera.test
index 3a91b824b..4de8fd0bb 100644
--- a/gazebo_plugins/test/camera/camera.test
+++ b/gazebo_plugins/test/camera/camera.test
@@ -6,7 +6,7 @@
 
   <node name="gazebo" pkg="gazebo_ros" type="gzserver"
       respawn="false" output="screen"
-      args="-r $(find gazebo_plugins)/test/camera/camera.world" />
+      args="--verbose $(find gazebo_plugins)/test/camera/camera.world" />
 
   <group if="$(arg gui)">
     <node name="gazebo_gui" pkg="gazebo_ros" type="gzclient" respawn="false" output="screen"/>
diff --git a/gazebo_plugins/test/camera/depth_camera.test b/gazebo_plugins/test/camera/depth_camera.test
index 3f4dd72bc..439129beb 100644
--- a/gazebo_plugins/test/camera/depth_camera.test
+++ b/gazebo_plugins/test/camera/depth_camera.test
@@ -6,7 +6,7 @@
 
   <node name="gazebo" pkg="gazebo_ros" type="gzserver"
       respawn="false" output="screen"
-      args="-r $(find gazebo_plugins)/test/camera/depth_camera.world" />
+      args="--verbose $(find gazebo_plugins)/test/camera/depth_camera.world" />
 
   <group if="$(arg gui)">
     <node name="gazebo_gui" pkg="gazebo_ros" type="gzclient" respawn="false" output="screen"/>
diff --git a/gazebo_plugins/test/camera/multicamera.test b/gazebo_plugins/test/camera/multicamera.test
index 7a96b28ef..3ec022ac0 100644
--- a/gazebo_plugins/test/camera/multicamera.test
+++ b/gazebo_plugins/test/camera/multicamera.test
@@ -4,7 +4,7 @@
 
   <node name="gazebo" pkg="gazebo_ros" type="gzserver"
       respawn="false" output="screen"
-      args="-r $(find gazebo_plugins)/test/camera/multicamera.world" />
+      args="--verbose $(find gazebo_plugins)/test/camera/multicamera.world" />
 
   <test test-name="multicamera" pkg="gazebo_plugins" type="multicamera-test"
       clear_params="true" time-limit="15.0" />
diff --git a/gazebo_plugins/test/set_model_state_test/set_model_state_test.test b/gazebo_plugins/test/set_model_state_test/set_model_state_test.test
index cddb37208..cee602106 100644
--- a/gazebo_plugins/test/set_model_state_test/set_model_state_test.test
+++ b/gazebo_plugins/test/set_model_state_test/set_model_state_test.test
@@ -1,12 +1,11 @@
 <!-- Launch file for ekf_localization_node_test-interfaces -->
 
 <launch>
-
     <param name="/use_sim_time" value="true" />
 
     <!-- gazebo server-->
-    <node name="gazebo" pkg="gazebo_ros" type="gzserver" respawn="false" output="screen" args="-r $(find gazebo_plugins)/test/set_model_state_test/set_model_state_test_p2dx.world" />
+    <node name="gazebo" pkg="gazebo_ros" type="gzserver" respawn="false" output="screen"
+          args="--verbose $(find gazebo_plugins)/test/set_model_state_test/set_model_state_test_p2dx.world" />
 
     <test test-name="set_model_state_test" pkg="gazebo_plugins" type="set_model_state-test" clear_params="true" time-limit="100.0" />
-
 </launch>