From 08312ae3353bc7caf6b479a617916f713a35e013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 28 Jan 2013 17:54:09 +0100 Subject: [PATCH] Math: minor code reorganization. Place "alias" methods after "implementation" methods. --- src/Math/RectangularMatrix.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index 176c6c742..ffc8248b1 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -204,19 +204,6 @@ template class RectangularMatrix { return RectangularMatrix(*this)-=other; } - /** - * @brief Multiply matrix with number - * - * @see operator*=(U), operator*(U, const RectangularMatrix&) - */ - #ifndef DOXYGEN_GENERATING_OUTPUT - template inline typename std::enable_if::value, RectangularMatrix>::type operator*(U number) const { - #else - template inline RectangularMatrix operator*(U number) const { - #endif - return RectangularMatrix(*this)*=number; - } - /** * @brief Multiply matrix with number and assign * @@ -236,16 +223,16 @@ template class RectangularMatrix { } /** - * @brief Divide matrix with number + * @brief Multiply matrix with number * - * @see operator/=(), operator/(U, const RectangularMatrix&) + * @see operator*=(U), operator*(U, const RectangularMatrix&) */ #ifndef DOXYGEN_GENERATING_OUTPUT - template inline typename std::enable_if::value, RectangularMatrix>::type operator/(U number) const { + template inline typename std::enable_if::value, RectangularMatrix>::type operator*(U number) const { #else - template inline RectangularMatrix operator/(U number) const { + template inline RectangularMatrix operator*(U number) const { #endif - return RectangularMatrix(*this)/=number; + return RectangularMatrix(*this)*=number; } /** @@ -266,6 +253,19 @@ template class RectangularMatrix { return *this; } + /** + * @brief Divide matrix with number + * + * @see operator/=(), operator/(U, const RectangularMatrix&) + */ + #ifndef DOXYGEN_GENERATING_OUTPUT + template inline typename std::enable_if::value, RectangularMatrix>::type operator/(U number) const { + #else + template inline RectangularMatrix operator/(U number) const { + #endif + return RectangularMatrix(*this)/=number; + } + /** * @brief Multiply matrix *