Browse Source

GCC 4.5 compatibility: some explicit typing needed.

Vladimír Vondruš 13 years ago
parent
commit
125b55c1dd
  1. 2
      src/Audio/AbstractImporter.cpp
  2. 2
      src/Audio/Test/AbstractImporterTest.cpp
  3. 4
      src/DebugTools/Implementation/CapsuleRendererTransformation.h

2
src/Audio/AbstractImporter.cpp

@ -80,7 +80,7 @@ void AbstractImporter::close() {
} }
Buffer::Format AbstractImporter::format() const { 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(); return doFormat();
} }

2
src/Audio/Test/AbstractImporterTest.cpp

@ -57,7 +57,7 @@ void AbstractImporterTest::openFile() {
opened = (data.size() == 1 && data[0] == 0xa5); 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 {}; } UnsignedInt doFrequency() const override { return {}; }
Corrade::Containers::Array<unsigned char> doData() override { return nullptr; } Corrade::Containers::Array<unsigned char> doData() override { return nullptr; }

4
src/DebugTools/Implementation/CapsuleRendererTransformation.h

@ -55,7 +55,7 @@ template<> std::array<Matrix3, 3> capsuleRendererTransformation<2>(const Vector2
/* Scaling and translation of all parts */ /* Scaling and translation of all parts */
const auto rotationScaling = rotation*Matrix3::scaling(Vector2(radius)); const auto rotationScaling = rotation*Matrix3::scaling(Vector2(radius));
return {{ return std::array<Matrix3, 3>{{
Matrix3::translation(a+capDistance)*rotationScaling, Matrix3::translation(a+capDistance)*rotationScaling,
Matrix3::translation(0.5f*(a + b))*rotation*Matrix3::scaling({radius, length}), Matrix3::translation(0.5f*(a + b))*rotation*Matrix3::scaling({radius, length}),
Matrix3::translation(b-capDistance)*rotationScaling Matrix3::translation(b-capDistance)*rotationScaling
@ -94,7 +94,7 @@ template<> std::array<Matrix4, 3> capsuleRendererTransformation<3>(const Vector3
/* Scaling and translation of all parts */ /* Scaling and translation of all parts */
const auto rotationScaling = rotation*Matrix4::scaling(Vector3(radius)); const auto rotationScaling = rotation*Matrix4::scaling(Vector3(radius));
return {{ return std::array<Matrix4, 3>{{
Matrix4::translation(a+capDistance)*rotationScaling, Matrix4::translation(a+capDistance)*rotationScaling,
Matrix4::translation(0.5f*(a + b))*rotation*Matrix4::scaling({radius, length, radius}), Matrix4::translation(0.5f*(a + b))*rotation*Matrix4::scaling({radius, length, radius}),
Matrix4::translation(b-capDistance)*rotationScaling Matrix4::translation(b-capDistance)*rotationScaling

Loading…
Cancel
Save