From 55af35d795bc1580998d72f464a493805f0ecbae Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Fri, 25 Mar 2005 16:31:05 +0000 Subject: I'll break this commit into two sections in the moto files I got rid of a few warnings about blah shadows a previous declaration. In the gameengine files I fix the following: removed some unused vars removed dos style line breaks added newlines to last line in a couple of files to remove warnings. Kent --- intern/moto/include/MT_Point2.h | 6 +++--- intern/moto/include/MT_Vector2.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/moto') diff --git a/intern/moto/include/MT_Point2.h b/intern/moto/include/MT_Point2.h index c6995f1ab0b..cc6819039fc 100644 --- a/intern/moto/include/MT_Point2.h +++ b/intern/moto/include/MT_Point2.h @@ -51,9 +51,9 @@ class MT_Point2 : public MT_Vector2 { public: MT_Point2() {} - MT_Point2(const float *v) : MT_Vector2(v) {} - MT_Point2(const double *v) : MT_Vector2(v) {} - MT_Point2(MT_Scalar x, MT_Scalar y) : MT_Vector2(x, y) {} + MT_Point2(const float *v2) : MT_Vector2(v2) {} + MT_Point2(const double *v2) : MT_Vector2(v2) {} + MT_Point2(MT_Scalar x2, MT_Scalar y2) : MT_Vector2(x2, y2) {} MT_Point2& operator+=(const MT_Vector2& v); MT_Point2& operator-=(const MT_Vector2& v); diff --git a/intern/moto/include/MT_Vector2.h b/intern/moto/include/MT_Vector2.h index 35748ce2b0d..629d962a781 100644 --- a/intern/moto/include/MT_Vector2.h +++ b/intern/moto/include/MT_Vector2.h @@ -52,8 +52,8 @@ class MT_Vector2 : public MT_Tuple2 { public: MT_Vector2() {} - MT_Vector2(const float *v) : MT_Tuple2(v) {} - MT_Vector2(const double *v) : MT_Tuple2(v) {} + MT_Vector2(const float *v2) : MT_Tuple2(v2) {} + MT_Vector2(const double *v2) : MT_Tuple2(v2) {} MT_Vector2(MT_Scalar xx, MT_Scalar yy) : MT_Tuple2(xx, yy) {} MT_Vector2& operator+=(const MT_Vector2& v); -- cgit v1.2.3