From 125b55c1ddadb72e61de2ffca60c3a59f5efe11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 22 Aug 2013 14:46:18 +0200 Subject: [PATCH] GCC 4.5 compatibility: some explicit typing needed. --- src/Audio/AbstractImporter.cpp | 2 +- src/Audio/Test/AbstractImporterTest.cpp | 2 +- src/DebugTools/Implementation/CapsuleRendererTransformation.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Audio/AbstractImporter.cpp b/src/Audio/AbstractImporter.cpp index 2e0ced0e3..e686c9114 100644 --- a/src/Audio/AbstractImporter.cpp +++ b/src/Audio/AbstractImporter.cpp @@ -80,7 +80,7 @@ void AbstractImporter::close() { } Buffer::Format AbstractImporter::format() const { - CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::format(): no file opened", {}); + CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::format(): no file opened", Buffer::Format()); return doFormat(); } diff --git a/src/Audio/Test/AbstractImporterTest.cpp b/src/Audio/Test/AbstractImporterTest.cpp index ff479d654..681e3f3d1 100644 --- a/src/Audio/Test/AbstractImporterTest.cpp +++ b/src/Audio/Test/AbstractImporterTest.cpp @@ -57,7 +57,7 @@ void AbstractImporterTest::openFile() { opened = (data.size() == 1 && data[0] == 0xa5); } - Buffer::Format doFormat() const override { return {}; } + Buffer::Format doFormat() const override { return Buffer::Format(); } UnsignedInt doFrequency() const override { return {}; } Corrade::Containers::Array doData() override { return nullptr; } diff --git a/src/DebugTools/Implementation/CapsuleRendererTransformation.h b/src/DebugTools/Implementation/CapsuleRendererTransformation.h index 5f9271a67..b08bb67a7 100644 --- a/src/DebugTools/Implementation/CapsuleRendererTransformation.h +++ b/src/DebugTools/Implementation/CapsuleRendererTransformation.h @@ -55,7 +55,7 @@ template<> std::array capsuleRendererTransformation<2>(const Vector2 /* Scaling and translation of all parts */ const auto rotationScaling = rotation*Matrix3::scaling(Vector2(radius)); - return {{ + return std::array{{ Matrix3::translation(a+capDistance)*rotationScaling, Matrix3::translation(0.5f*(a + b))*rotation*Matrix3::scaling({radius, length}), Matrix3::translation(b-capDistance)*rotationScaling @@ -94,7 +94,7 @@ template<> std::array capsuleRendererTransformation<3>(const Vector3 /* Scaling and translation of all parts */ const auto rotationScaling = rotation*Matrix4::scaling(Vector3(radius)); - return {{ + return std::array{{ Matrix4::translation(a+capDistance)*rotationScaling, Matrix4::translation(0.5f*(a + b))*rotation*Matrix4::scaling({radius, length, radius}), Matrix4::translation(b-capDistance)*rotationScaling