From 26d832b486cb4c76f0645ec1082cb1ca7f0872f8 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 10 Nov 2008 20:23:40 +0000 Subject: [PATCH] fix compiler warnings --- panda/src/linmath/lmatrix3_src.I | 6 +++--- panda/src/linmath/lmatrix3_src.h | 6 +++--- panda/src/linmath/lmatrix4_src.I | 6 +++--- panda/src/linmath/lmatrix4_src.h | 6 +++--- panda/src/linmath/lvecBase2_src.I | 2 +- panda/src/linmath/lvecBase2_src.h | 2 +- panda/src/linmath/lvecBase3_src.I | 2 +- panda/src/linmath/lvecBase3_src.h | 2 +- panda/src/linmath/lvecBase4_src.I | 2 +- panda/src/linmath/lvecBase4_src.h | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/panda/src/linmath/lmatrix3_src.I b/panda/src/linmath/lmatrix3_src.I index ada082a6e5..ce3594d075 100644 --- a/panda/src/linmath/lmatrix3_src.I +++ b/panda/src/linmath/lmatrix3_src.I @@ -62,7 +62,7 @@ __setitem__(int i, FLOATTYPE v) { // Access: Public, Static // Description: Returns 3: the number of columns of a LMatrix3. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix3)::Row:: +INLINE_LINMATH int FLOATNAME(LMatrix3)::Row:: size() { return 3; } @@ -92,7 +92,7 @@ operator [](int i) const { // Access: Public, Static // Description: Returns 3: the number of columns of a LMatrix3. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix3)::CRow:: +INLINE_LINMATH int FLOATNAME(LMatrix3)::CRow:: size() { return 3; } @@ -347,7 +347,7 @@ operator [](int i) { // Access: Public, Static // Description: Returns 3: the number of rows of a LMatrix3. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix3):: +INLINE_LINMATH int FLOATNAME(LMatrix3):: size() { return 3; } diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index e5911d3f0e..600cba69d1 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/panda/src/linmath/lmatrix3_src.h @@ -38,7 +38,7 @@ PUBLISHED: #ifdef HAVE_PYTHON INLINE_LINMATH void __setitem__(int i, FLOATTYPE v); #endif - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); private: FLOATTYPE *_row; friend class FLOATNAME(LMatrix3); @@ -48,7 +48,7 @@ PUBLISHED: INLINE_LINMATH CRow(const FLOATTYPE *row); PUBLISHED: INLINE_LINMATH FLOATTYPE operator [](int i) const; - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); private: const FLOATTYPE *_row; friend class FLOATNAME(LMatrix3); @@ -96,7 +96,7 @@ PUBLISHED: INLINE_LINMATH CRow operator [](int i) const; INLINE_LINMATH Row operator [](int i); - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); INLINE_LINMATH bool is_nan() const; diff --git a/panda/src/linmath/lmatrix4_src.I b/panda/src/linmath/lmatrix4_src.I index 643e3840dc..915d456028 100644 --- a/panda/src/linmath/lmatrix4_src.I +++ b/panda/src/linmath/lmatrix4_src.I @@ -62,7 +62,7 @@ __setitem__(int i, FLOATTYPE v) { // Access: Public, Static // Description: Returns 4: the number of columns of a LMatrix4. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix4)::Row:: +INLINE_LINMATH int FLOATNAME(LMatrix4)::Row:: size() { return 4; } @@ -92,7 +92,7 @@ operator [](int i) const { // Access: Public, Static // Description: Returns 4: the number of columns of a LMatrix4. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix4)::CRow:: +INLINE_LINMATH int FLOATNAME(LMatrix4)::CRow:: size() { return 4; } @@ -525,7 +525,7 @@ operator [](int i) { // Access: Public, Static // Description: Returns 4: the number of rows of a LMatrix4. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LMatrix4):: +INLINE_LINMATH int FLOATNAME(LMatrix4):: size() { return 4; } diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index 68be7282b6..e27730c0c1 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/panda/src/linmath/lmatrix4_src.h @@ -33,7 +33,7 @@ PUBLISHED: #ifdef HAVE_PYTHON INLINE_LINMATH void __setitem__(int i, FLOATTYPE v); #endif - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); private: FLOATTYPE *_row; friend class FLOATNAME(LMatrix4); @@ -43,7 +43,7 @@ PUBLISHED: INLINE_LINMATH CRow(const FLOATTYPE *row); PUBLISHED: INLINE_LINMATH FLOATTYPE operator [](int i) const; - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); private: const FLOATTYPE *_row; friend class FLOATNAME(LMatrix4); @@ -99,7 +99,7 @@ PUBLISHED: INLINE_LINMATH CRow operator [](int i) const; INLINE_LINMATH Row operator [](int i); - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); INLINE_LINMATH bool is_nan() const; diff --git a/panda/src/linmath/lvecBase2_src.I b/panda/src/linmath/lvecBase2_src.I index 389c26a5ea..39dbb98c1a 100644 --- a/panda/src/linmath/lvecBase2_src.I +++ b/panda/src/linmath/lvecBase2_src.I @@ -162,7 +162,7 @@ __setitem__(int i, FLOATTYPE v) { // Access: Public, Static // Description: Returns 2: the number of components of a LVecBase2. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LVecBase2):: +INLINE_LINMATH int FLOATNAME(LVecBase2):: size() { return 2; } diff --git a/panda/src/linmath/lvecBase2_src.h b/panda/src/linmath/lvecBase2_src.h index ff7fb015b3..a20817ef53 100644 --- a/panda/src/linmath/lvecBase2_src.h +++ b/panda/src/linmath/lvecBase2_src.h @@ -44,7 +44,7 @@ PUBLISHED: #ifdef HAVE_PYTHON INLINE_LINMATH void __setitem__(int i, FLOATTYPE v); #endif - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); INLINE_LINMATH bool is_nan() const; diff --git a/panda/src/linmath/lvecBase3_src.I b/panda/src/linmath/lvecBase3_src.I index 4095c096ff..791cbc83a7 100644 --- a/panda/src/linmath/lvecBase3_src.I +++ b/panda/src/linmath/lvecBase3_src.I @@ -174,7 +174,7 @@ __setitem__(int i, FLOATTYPE v) { // Access: Public, Static // Description: Returns 3: the number of components of a LVecBase3. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LVecBase3):: +INLINE_LINMATH int FLOATNAME(LVecBase3):: size() { return 3; } diff --git a/panda/src/linmath/lvecBase3_src.h b/panda/src/linmath/lvecBase3_src.h index 70dde11b01..5199144f35 100644 --- a/panda/src/linmath/lvecBase3_src.h +++ b/panda/src/linmath/lvecBase3_src.h @@ -42,7 +42,7 @@ PUBLISHED: #ifdef HAVE_PYTHON INLINE_LINMATH void __setitem__(int i, FLOATTYPE v); #endif - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); INLINE_LINMATH bool is_nan() const; diff --git a/panda/src/linmath/lvecBase4_src.I b/panda/src/linmath/lvecBase4_src.I index 47ade7a0c0..80d26e7516 100644 --- a/panda/src/linmath/lvecBase4_src.I +++ b/panda/src/linmath/lvecBase4_src.I @@ -188,7 +188,7 @@ __setitem__(int i, FLOATTYPE v) { // Access: Public, Static // Description: Returns 4: the number of components of a LVecBase4. //////////////////////////////////////////////////////////////////// -INLINE_LINMATH size_t FLOATNAME(LVecBase4):: +INLINE_LINMATH int FLOATNAME(LVecBase4):: size() { return 4; } diff --git a/panda/src/linmath/lvecBase4_src.h b/panda/src/linmath/lvecBase4_src.h index 981c59a078..09d754de5a 100644 --- a/panda/src/linmath/lvecBase4_src.h +++ b/panda/src/linmath/lvecBase4_src.h @@ -43,7 +43,7 @@ PUBLISHED: #ifdef HAVE_PYTHON INLINE_LINMATH void __setitem__(int i, FLOATTYPE v); #endif - INLINE_LINMATH static size_t size(); + INLINE_LINMATH static int size(); INLINE_LINMATH bool is_nan() const;