Browse Source

GCC 4.6 compatibility: std::array<Vector2> can't be constexpr.

Don't know why.
pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
181cf2cf11
  1. 9
      src/MeshTools/Test/TransformTest.cpp

9
src/MeshTools/Test/TransformTest.cpp

@ -41,6 +41,11 @@ TransformTest::TransformTest() {
&TransformTest::transformPoints3D);
}
/* GCC < 4.7 doesn't like constexpr here, don't know why */
#ifdef CORRADE_GCC46_COMPATIBILITY
#define constexpr const
#endif
constexpr static std::array<Vector2, 2> points2D{{
{-3.0f, 4.0f},
{ 2.5f, -15.0f}
@ -71,6 +76,10 @@ constexpr static std::array<Vector3, 2> points3DRotatedTranslated{{
{15.0f, 1.5f, 1.5f}
}};
#ifdef CORRADE_GCC46_COMPATIBILITY
#undef constexpr
#endif
void TransformTest::transformVectors2D() {
auto matrix = MeshTools::transformVectors(Matrix3::rotation(Deg(90.0f)), points2D);
auto complex = MeshTools::transformVectors(Complex::rotation(Deg(90.0f)), points2D);

Loading…
Cancel
Save