[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24008] trunk/blender/intern/itasc/kdl: Fix in KDL for gcc 3.3 compilation

[Ton Roosendaal]

Revision: 24008
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24008
Author:   ton
Date:     2009-10-20 18:02:41 +0200 (Tue, 20 Oct 2009)

Log Message:
-----------
Fix in KDL for gcc 3.3 compilation
Thanks to Benoit Bolsee and Alexander Clausen for help!

Modified Paths:
--------------
    trunk/blender/intern/itasc/kdl/frameacc.hpp
    trunk/blender/intern/itasc/kdl/framevel.hpp

Modified: trunk/blender/intern/itasc/kdl/frameacc.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/frameacc.hpp	2009-10-20 15:51:25 UTC (rev 24007)
+++ trunk/blender/intern/itasc/kdl/frameacc.hpp	2009-10-20 16:02:41 UTC (rev 24008)
@@ -98,9 +98,9 @@
     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 @@
     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);

Modified: trunk/blender/intern/itasc/kdl/framevel.hpp
===================================================================
--- trunk/blender/intern/itasc/kdl/framevel.hpp	2009-10-20 15:51:25 UTC (rev 24007)
+++ trunk/blender/intern/itasc/kdl/framevel.hpp	2009-10-20 16:02:41 UTC (rev 24008)
@@ -133,8 +133,8 @@
     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:
     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) {}