Commit 6c7c9e24 authored by Iulian Grindeanu's avatar Iulian Grindeanu

guard if DEPRECATED is defined already

also, show the use of the deprecated constructor
a warning will show up
maybe we want to remove the warning from tests?
parent 2274608e
...@@ -345,12 +345,13 @@ public: ...@@ -345,12 +345,13 @@ public:
row0[2], row1[2], row2[2]; row0[2], row1[2], row2[2];
} }
} }
#ifndef DEPRECATED
#ifdef __GNUC__ #ifdef __GNUC__
#define DEPRECATED __attribute__((deprecated)) #define DEPRECATED __attribute__((deprecated))
#else #else
#pragma message("WARNING: You need to implement DEPRECATED for this compiler") #pragma message("WARNING: You need to implement DEPRECATED for this compiler")
#define DEPRECATED #define DEPRECATED
#endif
#endif #endif
/* /*
* \deprecated { Use instead the constructor with explicit fourth argument, bool isRow, above } * \deprecated { Use instead the constructor with explicit fourth argument, bool isRow, above }
...@@ -365,7 +366,7 @@ public: ...@@ -365,7 +366,7 @@ public:
row1[0], row1[1], row1[2], row1[0], row1[1], row1[2],
row2[0], row2[1], row2[2]; row2[0], row2[1], row2[2];
} }
#undef DEPRECATED
inline Matrix3( const double v[9] ){ inline Matrix3( const double v[9] ){
_mat << v[0], v[1], v[2], _mat << v[0], v[1], v[2],
......
...@@ -97,6 +97,11 @@ void test_EigenDecomp() ...@@ -97,6 +97,11 @@ void test_EigenDecomp()
//now verfy that the returns Eigenvalues and Eigenvectors are correct (within some tolerance) //now verfy that the returns Eigenvalues and Eigenvectors are correct (within some tolerance)
double tol = 1e-04; double tol = 1e-04;
// use a deprecated constructor
Matrix3 mat3( CartVect(2, -1, 0), CartVect(-1, 2, -1), CartVect(0, -1, 2));
CHECK_REAL_EQUAL( mat(1), mat3(1), tol);
vec0_check.normalize(); vec0_check.normalize();
vec1_check.normalize(); vec1_check.normalize();
vec2_check.normalize(); vec2_check.normalize();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment