From 6ccd64d99ed78173203a6444dc284db85dc2bf84 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 9 Nov 2015 18:13:29 +0100 Subject: [PATCH] Fix ordering of methods relative to MAKE_SEQ --- panda/src/linmath/lmatrix3_src.h | 8 ++++---- panda/src/linmath/lmatrix4_src.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index 8bcae35c6c..934cd5e53c 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/panda/src/linmath/lmatrix3_src.h @@ -76,6 +76,10 @@ PUBLISHED: FLOATTYPE e10, FLOATTYPE e11, FLOATTYPE e12, FLOATTYPE e20, FLOATTYPE e21, FLOATTYPE e22); + INLINE_LINMATH CRow operator [](int i) const; + INLINE_LINMATH Row operator [](int i); + INLINE_LINMATH static int size(); + INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase3) &v); INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase3) &v); @@ -99,10 +103,6 @@ PUBLISHED: INLINE_LINMATH FLOATTYPE &operator () (int row, int col); INLINE_LINMATH FLOATTYPE operator () (int row, int col) const; - INLINE_LINMATH CRow operator [](int i) const; - INLINE_LINMATH Row operator [](int i); - INLINE_LINMATH static int size(); - INLINE_LINMATH bool is_nan() const; INLINE_LINMATH bool is_identity() const; diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index 14fe9fe869..61a0d45018 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/panda/src/linmath/lmatrix4_src.h @@ -85,6 +85,10 @@ PUBLISHED: INLINE_LINMATH void set_upper_3(const FLOATNAME(LMatrix3) &upper3); INLINE_LINMATH FLOATNAME(LMatrix3) get_upper_3() const; + INLINE_LINMATH CRow operator [](int i) const; + INLINE_LINMATH Row operator [](int i); + INLINE_LINMATH static int size(); + INLINE_LINMATH void set_row(int row, const FLOATNAME(LVecBase4) &v); INLINE_LINMATH void set_col(int col, const FLOATNAME(LVecBase4) &v); @@ -107,10 +111,6 @@ PUBLISHED: INLINE_LINMATH FLOATTYPE &operator () (int row, int col); INLINE_LINMATH FLOATTYPE operator () (int row, int col) const; - INLINE_LINMATH CRow operator [](int i) const; - INLINE_LINMATH Row operator [](int i); - INLINE_LINMATH static int size(); - INLINE_LINMATH bool is_nan() const; INLINE_LINMATH bool is_identity() const;