From 68c326eedd463dde9e83ef6683de5d8202d8c567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 16 Jan 2014 19:41:07 +0100 Subject: [PATCH] GCC 4.5 compatibility: can't list-initialize array of classes. As said earlier in cb7a0f6404372f866b5c0513d5aaa3b18000dda6, this is just another case of the same issue. --- src/Magnum/Math/RectangularMatrix.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 2ebb99b29..bf5246709 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -671,7 +671,13 @@ namespace Implementation { } } +#ifndef CORRADE_GCC45_COMPATIBILITY template template inline constexpr RectangularMatrix::RectangularMatrix(Implementation::Sequence, const Vector& diagonal): _data{Implementation::diagonalMatrixColumn(sequence < DiagonalSize ? diagonal[sequence] : T{})...} {} +#else +template template inline RectangularMatrix::RectangularMatrix(Implementation::Sequence, const Vector& diagonal) { + constructInternal({Implementation::diagonalMatrixColumn(sequence < DiagonalSize ? diagonal[sequence] : T{})...}); +} +#endif template inline Vector RectangularMatrix::row(std::size_t row) const { Vector out;