From 6b89efa601824d39666c14dd3d4a702cd736389f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20G=C3=BCnther?= <martin.guenther@dfki.de>
Date: Tue, 20 Mar 2018 14:49:07 +0100
Subject: [PATCH] Improve namespace handling

---
 src/mimic_joint_plugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mimic_joint_plugin.cpp b/src/mimic_joint_plugin.cpp
index d246952..a6c2177 100644
--- a/src/mimic_joint_plugin.cpp
+++ b/src/mimic_joint_plugin.cpp
@@ -23,9 +23,9 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISE
 #include <roboticsgroup_gazebo_plugins/mimic_joint_plugin.h>
 
 #if GAZEBO_MAJOR_VERSION >= 8
-using namespace ignition::math;
+namespace math = ignition::math;
 #else
-using namespace gazebo::math;
+namespace math = gazebo::math;
 #endif
 
 namespace gazebo {
@@ -165,7 +165,7 @@ namespace gazebo {
                 if (a != a)
                     a = angle;
                 double error = angle - a;
-                double effort = clamp(pid_.computeCommand(error, period), -max_effort_, max_effort_);
+                double effort = math::clamp(pid_.computeCommand(error, period), -max_effort_, max_effort_);
                 mimic_joint_->SetForce(0, effort);
             }
             else {
-- 
2.12.0