From 2d92d497d9a1b20c9ff83e386b58745955204d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Mar 2013 20:45:06 +0100 Subject: [PATCH] GCC 4.6 compatibility: can't list-initialize array of classes. Awesome bug. In GCC 4.6 it throws plenty of ungoogleable `-pedantic` warnings and in GCC 4.5 it fails directly with "error: bad array initializer". Fallback to initialization using for-cycle. Hello, performance? You can go home now. --- src/Math/RectangularMatrix.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index fb869992d..8fa5ac663 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -106,7 +106,12 @@ template class RectangularMatrix { * * @todo Creating matrix from arbitrary combination of matrices with n rows */ + #ifndef CORRADE_GCC46_COMPATIBILITY template inline constexpr /*implicit*/ RectangularMatrix(const Vector& first, const U&... next): _data{first, next...} { + #else + template inline /*implicit*/ RectangularMatrix(const Vector& first, const U&... next): _data() { + constructInternal({first, next...}); + #endif static_assert(sizeof...(next)+1 == cols, "Improper number of arguments passed to RectangularMatrix constructor"); } @@ -443,7 +448,21 @@ template class RectangularMatrix { private: /* Implementation for RectangularMatrix::RectangularMatrix(const RectangularMatrix&) */ + #ifndef CORRADE_GCC46_COMPATIBILITY template inline constexpr explicit RectangularMatrix(Implementation::Sequence, const RectangularMatrix& matrix): _data{Vector(matrix[sequence])...} {} + #else + template inline constexpr explicit RectangularMatrix(Implementation::Sequence, const RectangularMatrix& matrix): _data() { + constructInternal({Vector(matrix[sequence])...}); + } + #endif + + #ifdef CORRADE_GCC46_COMPATIBILITY + /* GCC < 4.7 workaround for a ton of warnings / "error: bad array initializer" */ + inline void constructInternal(std::initializer_list> data) { + for(std::size_t i = 0; i != data.size(); ++i) + _data[i] = *(data.begin() + i); + } + #endif Vector _data[cols]; };