From fd75c89949010be5303f34e6ef1d6e8d97812afd Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 18 Dec 2011 02:03:58 +0000 Subject: [PATCH] whoops, overloaded LINMATH_ALIGN by mistake --- panda/src/linmath/lmatrix3_src.h | 2 +- panda/src/linmath/lmatrix4_src.h | 2 +- panda/src/linmath/lorientation_src.h | 2 +- panda/src/linmath/lpoint2_src.h | 2 +- panda/src/linmath/lpoint3_src.h | 2 +- panda/src/linmath/lpoint4_src.h | 2 +- panda/src/linmath/lquaternion_src.h | 2 +- panda/src/linmath/lrotation_src.h | 2 +- panda/src/linmath/lsimpleMatrix.h | 4 ++-- panda/src/linmath/lvecBase2_src.h | 2 +- panda/src/linmath/lvecBase3_src.h | 2 +- panda/src/linmath/lvecBase4_src.h | 2 +- panda/src/linmath/lvector2_src.h | 2 +- panda/src/linmath/lvector3_src.h | 2 +- panda/src/linmath/lvector4_src.h | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index 9ee8a47b29..6cb3e46cd7 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/panda/src/linmath/lmatrix3_src.h @@ -22,7 +22,7 @@ class FLOATNAME(LMatrix4); // (rotation, scale, translation) in 2-d, e.g. for a // texture matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LMatrix3) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LMatrix3) { public: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index 9f06c49c42..05900c7691 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/panda/src/linmath/lmatrix4_src.h @@ -17,7 +17,7 @@ // Class : LMatrix4 // Description : This is a 4-by-4 transform matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LMatrix4) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LMatrix4) { public: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lorientation_src.h b/panda/src/linmath/lorientation_src.h index 47635ea45b..56fa40653b 100644 --- a/panda/src/linmath/lorientation_src.h +++ b/panda/src/linmath/lorientation_src.h @@ -18,7 +18,7 @@ class FLOATNAME(LRotation); // Class : LOrientation // Description : This is a unit quaternion representing an orientation. //////////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LOrientation) : public FLOATNAME(LQuaternion) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LOrientation) : public FLOATNAME(LQuaternion) { PUBLISHED: INLINE_LINMATH FLOATNAME(LOrientation)(); INLINE_LINMATH FLOATNAME(LOrientation)(const FLOATNAME(LQuaternion)&); diff --git a/panda/src/linmath/lpoint2_src.h b/panda/src/linmath/lpoint2_src.h index 64150c8ccb..3568824867 100644 --- a/panda/src/linmath/lpoint2_src.h +++ b/panda/src/linmath/lpoint2_src.h @@ -17,7 +17,7 @@ // Class : LPoint2 // Description : This is a two-component point in space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LPoint2) : public FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LPoint2) : public FLOATNAME(LVecBase2) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint2)(); INLINE_LINMATH FLOATNAME(LPoint2)(const FLOATNAME(LVecBase2) ©); diff --git a/panda/src/linmath/lpoint3_src.h b/panda/src/linmath/lpoint3_src.h index 04135ec0aa..7752b28925 100644 --- a/panda/src/linmath/lpoint3_src.h +++ b/panda/src/linmath/lpoint3_src.h @@ -22,7 +22,7 @@ // vector, while addition of a vector and a point yields // a point. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LPoint3) : public FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LPoint3) : public FLOATNAME(LVecBase3) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint3)(); INLINE_LINMATH FLOATNAME(LPoint3)(const FLOATNAME(LVecBase3) ©); diff --git a/panda/src/linmath/lpoint4_src.h b/panda/src/linmath/lpoint4_src.h index 3c097c958b..1632abf214 100644 --- a/panda/src/linmath/lpoint4_src.h +++ b/panda/src/linmath/lpoint4_src.h @@ -16,7 +16,7 @@ // Class : LPoint4 // Description : This is a four-component point in space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LPoint4) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LPoint4) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint4)(); INLINE_LINMATH FLOATNAME(LPoint4)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/linmath/lquaternion_src.h b/panda/src/linmath/lquaternion_src.h index 35c0e01a51..63a6486c85 100644 --- a/panda/src/linmath/lquaternion_src.h +++ b/panda/src/linmath/lquaternion_src.h @@ -16,7 +16,7 @@ // Class : FLOATNAME(LQuaternion) // Description : This is the base quaternion class //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LQuaternion) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LQuaternion) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LQuaternion)(); INLINE_LINMATH FLOATNAME(LQuaternion)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/linmath/lrotation_src.h b/panda/src/linmath/lrotation_src.h index 9991948b13..5473c5ce4f 100644 --- a/panda/src/linmath/lrotation_src.h +++ b/panda/src/linmath/lrotation_src.h @@ -16,7 +16,7 @@ // Class : LRotation // Description : This is a unit quaternion representing a rotation. //////////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LRotation) : public FLOATNAME(LQuaternion) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LRotation) : public FLOATNAME(LQuaternion) { PUBLISHED: INLINE_LINMATH FLOATNAME(LRotation)(); INLINE_LINMATH FLOATNAME(LRotation)(const FLOATNAME(LQuaternion) &); diff --git a/panda/src/linmath/lsimpleMatrix.h b/panda/src/linmath/lsimpleMatrix.h index 29c01b8fdb..2cb4c15e3b 100644 --- a/panda/src/linmath/lsimpleMatrix.h +++ b/panda/src/linmath/lsimpleMatrix.h @@ -59,9 +59,9 @@ private: // This is as good a place as any to define this alignment macro. #ifdef LINMATH_ALIGN -#define LINMATH_ALIGN ALIGN_16BYTE +#define ALIGN_LINMATH ALIGN_16BYTE #else -#define LINMATH_ALIGN +#define ALIGN_LINMATH #endif // LINMATH_ALIGN #endif diff --git a/panda/src/linmath/lvecBase2_src.h b/panda/src/linmath/lvecBase2_src.h index 239177e388..fab05ee570 100644 --- a/panda/src/linmath/lvecBase2_src.h +++ b/panda/src/linmath/lvecBase2_src.h @@ -18,7 +18,7 @@ // Description : This is the base class for all two-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVecBase2) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvecBase3_src.h b/panda/src/linmath/lvecBase3_src.h index 338be04bf4..78f5d3196b 100644 --- a/panda/src/linmath/lvecBase3_src.h +++ b/panda/src/linmath/lvecBase3_src.h @@ -17,7 +17,7 @@ // Description : This is the base class for all three-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVecBase3) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvecBase4_src.h b/panda/src/linmath/lvecBase4_src.h index 0087f6dcdf..be24a062b0 100644 --- a/panda/src/linmath/lvecBase4_src.h +++ b/panda/src/linmath/lvecBase4_src.h @@ -20,7 +20,7 @@ class FLOATNAME(LVecBase3); // Description : This is the base class for all three-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVecBase4) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvector2_src.h b/panda/src/linmath/lvector2_src.h index f4c5a10876..542b628942 100644 --- a/panda/src/linmath/lvector2_src.h +++ b/panda/src/linmath/lvector2_src.h @@ -16,7 +16,7 @@ // Class : LVector2 // Description : This is a two-component vector offset. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVector2) : public FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVector2) : public FLOATNAME(LVecBase2) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector2)(); INLINE_LINMATH FLOATNAME(LVector2)(const FLOATNAME(LVecBase2) ©); diff --git a/panda/src/linmath/lvector3_src.h b/panda/src/linmath/lvector3_src.h index 9c532a4d47..b12f75c956 100644 --- a/panda/src/linmath/lvector3_src.h +++ b/panda/src/linmath/lvector3_src.h @@ -22,7 +22,7 @@ // vector, while addition of a vector and a point yields // a point. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVector3) : public FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVector3) : public FLOATNAME(LVecBase3) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector3)(); INLINE_LINMATH FLOATNAME(LVector3)(const FLOATNAME(LVecBase3) ©); diff --git a/panda/src/linmath/lvector4_src.h b/panda/src/linmath/lvector4_src.h index f99d68055e..a82e8ee975 100644 --- a/panda/src/linmath/lvector4_src.h +++ b/panda/src/linmath/lvector4_src.h @@ -16,7 +16,7 @@ // Class : LVector4 // Description : This is a four-component vector distance. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA_LINMATH LINMATH_ALIGN FLOATNAME(LVector4) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH ALIGN_LINMATH FLOATNAME(LVector4) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector4)(); INLINE_LINMATH FLOATNAME(LVector4)(const FLOATNAME(LVecBase4) ©);