From 5d0f5d210a5f7e6e0d10153b573468f39d8eae69 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Tue, 20 Oct 2009 16:02:41 +0000
Subject: Fix in KDL for gcc 3.3 compilation Thanks to Benoit Bolsee and
 Alexander Clausen for help!

---
 intern/itasc/kdl/frameacc.hpp | 12 ++++++------
 intern/itasc/kdl/framevel.hpp | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'intern/itasc')

diff --git a/intern/itasc/kdl/frameacc.hpp b/intern/itasc/kdl/frameacc.hpp
index 4157237222e..43e38698ef3 100644
--- a/intern/itasc/kdl/frameacc.hpp
+++ b/intern/itasc/kdl/frameacc.hpp
@@ -98,9 +98,9 @@ public:
     Vector   dw;    //!< angular acceration vector
 public:
     RotationAcc():R(),w() {}
-    explicit RotationAcc(const Rotation& _R):R(_R),w(Vector::Zero()){}
-    RotationAcc(const Rotation& _R,const Vector& _w,const Vector& _dw):
-        R(_R),w(_w),dw(_dw) {}
+    explicit RotationAcc(const Rotation& R_):R(R_),w(Vector::Zero()){}
+    RotationAcc(const Rotation& R_,const Vector& _w,const Vector& _dw):
+        R(R_),w(_w),dw(_dw) {}
     IMETHOD RotationAcc& operator = (const RotationAcc& arg);
     IMETHOD RotationAcc& operator = (const Rotation& arg);
     IMETHOD static RotationAcc Identity();
@@ -152,9 +152,9 @@ public:
     VectorAcc   p;   //!< Translation, velocity and acceleration of origin.
 public:
     FrameAcc(){}
-    explicit FrameAcc(const Frame& _T):M(_T.M),p(_T.p) {}
-    FrameAcc(const Frame& _T,const Twist& _t,const Twist& _dt):
-        M(_T.M,_t.rot,_dt.rot),p(_T.p,_t.vel,_dt.vel) {}
+    explicit FrameAcc(const Frame& T_):M(T_.M),p(T_.p) {}
+    FrameAcc(const Frame& T_,const Twist& _t,const Twist& _dt):
+        M(T_.M,_t.rot,_dt.rot),p(T_.p,_t.vel,_dt.vel) {}
     FrameAcc(const RotationAcc& _M,const VectorAcc& _p):M(_M),p(_p) {}
 
     IMETHOD FrameAcc& operator = (const FrameAcc& arg);
diff --git a/intern/itasc/kdl/framevel.hpp b/intern/itasc/kdl/framevel.hpp
index 21a7844f522..b70182bccde 100644
--- a/intern/itasc/kdl/framevel.hpp
+++ b/intern/itasc/kdl/framevel.hpp
@@ -133,8 +133,8 @@ public:
     Vector   w; // rotation vector
 public:
     RotationVel():R(),w() {}
-    explicit RotationVel(const Rotation& _R):R(_R),w(Vector::Zero()){}
-    RotationVel(const Rotation& _R,const Vector& _w):R(_R),w(_w){}
+    explicit RotationVel(const Rotation& R_):R(R_),w(Vector::Zero()){}
+    RotationVel(const Rotation& R_,const Vector& _w):R(R_),w(_w){}
 
 
     Rotation value() const { return R;}
@@ -194,11 +194,11 @@ public:
 public:
     FrameVel(){}
 
-    explicit FrameVel(const Frame& _T):
-        M(_T.M),p(_T.p) {}
+    explicit FrameVel(const Frame& T_):
+        M(T_.M),p(T_.p) {}
 
-    FrameVel(const Frame& _T,const Twist& _t):
-        M(_T.M,_t.rot),p(_T.p,_t.vel) {}
+    FrameVel(const Frame& T_,const Twist& _t):
+        M(T_.M,_t.rot),p(T_.p,_t.vel) {}
 
     FrameVel(const RotationVel& _M,const VectorVel& _p):
         M(_M),p(_p) {}
-- 
cgit v1.2.3