From: Antonio Valentino Date: Thu, 30 Dec 2021 17:18:02 +0000 Subject: Fix tempaletes declaration Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5 --- doris_core/matrixspecs.cc | 69 ++++++----------------------------------------- 1 file changed, 8 insertions(+), 61 deletions(-) diff --git a/doris_core/matrixspecs.cc b/doris_core/matrixspecs.cc index fa4c1b8..7aa672f 100755 --- a/doris_core/matrixspecs.cc +++ b/doris_core/matrixspecs.cc @@ -3250,22 +3250,8 @@ matrix mat2cr4( * C *= A; pointwise multiplication, CR4 R4 * #%// BK 26-Oct-2000 ****************************************************************/ -#if __GNUC__ < 4 -//template<> // essential for specialization -//template // seems not allowed for g++2.95 -//#if __GNUC_MINOR__ < 95 -//#endif -// -#else -#if __GNUC_MINOR__ > 0 -template<> // essential for specialization -template<> // seems required for specialization g++-4.0 upwards -#else -template<> // essential for specialization -template // seems required for specialization g++-4.0 upwards -#endif -#endif -// **************************************************************** +template <> +template <> matrix& matrix::operator *= (const matrix &A) { #ifdef __DEBUGMAT2 @@ -3293,21 +3279,8 @@ matrix& matrix::operator *= (const matrix &A) * C /= A; pointwise division, CR4 R4 * #%// BK 27-Oct-2000 * ****************************************************************/ -#if __GNUC__ < 4 -//template<> // essential for specialization -//template // seems not allowed for g++2.95 -//#if __GNUC_MINOR__ < 95 -//#endif -// -#else /* g++-4.0 upwards */ -#if __GNUC_MINOR__ > 0 -template<> // essential for specialization -template<> // seems required for specialization g++-4.0 upwards -#else -template<> // essential for specialization -template // seems required for specialization g++-4.0 upwards -#endif -#endif +template <> +template <> matrix& matrix::operator /= (const matrix &A) { #ifdef __DEBUGMAT2 @@ -3335,21 +3308,8 @@ matrix& matrix::operator /= (const matrix &A) * C += A; pointwise addition, CR4 R4 * #%// BK 27-Oct-2000 * ****************************************************************/ -#if __GNUC__ < 4 -//template<> // essential for specialization -//template // seems not allowed for g++2.95 -//#if __GNUC_MINOR__ < 95 -//#endif -// -#else /* g++-4.0 upwards */ -#if __GNUC_MINOR__ > 0 -template<> // essential for specialization -template<> // seems required for specialization g++-4.0 upwards -#else -template<> // essential for specialization -template // seems required for specialization g++-4.0 upwards -#endif -#endif +template <> +template <> matrix& matrix::operator += (const matrix &A) { #ifdef __DEBUGMAT2 @@ -3377,21 +3337,8 @@ matrix& matrix::operator += (const matrix &A) * C -= A; pointwise subtraction, CR4 R4 * #%// BK 27-Oct-2000 * ****************************************************************/ -#if __GNUC__ < 4 -//template<> // essential for specialization -//template // seems not allowed for g++2.95 -//#if __GNUC_MINOR__ < 95 -//#endif -// -#else /* g++-4.0 upwards */ -#if __GNUC_MINOR__ > 0 -template<> // essential for specialization -template<> // seems required for specialization g++-4.0 upwards -#else -template<> // essential for specialization -template // seems required for specialization g++-4.0 upwards -#endif -#endif +template <> +template <> matrix& matrix::operator -= (const matrix &A) { #ifdef __DEBUGMAT2