From ae013effff73a7da38c34297542b5b50eb590a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 6 Dec 2012 19:41:15 +0100 Subject: [PATCH] Adapted to Corrade changes. Optimalizations in Corrade::TestSuite and Corrade::Utility::Debug leaded to significant reduction of compilation time - on my machine it was ~5:38 before with building of unit tests enabled, now only ~5:00. --- src/AbstractImage.cpp | 2 +- src/Implementation/BufferState.cpp | 2 +- src/Math/Algorithms/Test/GaussJordanTest.h | 2 +- src/Math/Geometry/Test/DistanceTest.h | 2 +- src/Math/Geometry/Test/IntersectionTest.h | 2 +- src/Math/Test/ConstantsTest.h | 2 +- src/Math/Test/MathTest.h | 2 +- src/Math/Test/MathTypeTraitsTest.h | 2 +- src/Math/Test/Matrix3Test.h | 2 +- src/Math/Test/Matrix4Test.h | 2 +- src/Math/Test/MatrixTest.h | 2 +- src/Math/Test/Point2DTest.h | 2 +- src/Math/Test/Point3DTest.h | 2 +- src/Math/Test/RectangularMatrixTest.h | 2 +- src/Math/Test/Vector2Test.h | 2 +- src/Math/Test/Vector3Test.h | 2 +- src/Math/Test/Vector4Test.h | 2 +- src/Math/Test/VectorTest.h | 2 +- src/Math/Vector.h | 2 ++ src/Mesh.h | 2 +- src/MeshTools/Test/CleanTest.h | 2 +- src/MeshTools/Test/CombineIndexedArraysTest.h | 2 +- src/MeshTools/Test/CompressIndicesTest.h | 2 +- src/MeshTools/Test/FlipNormalsTest.h | 2 +- src/MeshTools/Test/GenerateFlatNormalsTest.h | 2 +- src/MeshTools/Test/InterleaveTest.h | 2 +- src/MeshTools/Test/SubdivideTest.h | 2 +- src/MeshTools/Test/TipsifyTest.h | 2 +- src/Physics/ShapeGroup.h | 1 + src/Physics/Test/AbstractShapeTest.h | 2 +- src/Physics/Test/AxisAlignedBoxTest.h | 2 +- src/Physics/Test/BoxTest.h | 2 +- src/Physics/Test/CapsuleTest.h | 2 +- src/Physics/Test/LineTest.h | 2 +- src/Physics/Test/ObjectShapeTest.h | 2 +- src/Physics/Test/PlaneTest.h | 2 +- src/Physics/Test/PointTest.h | 2 +- src/Physics/Test/ShapeGroupTest.h | 2 +- src/Physics/Test/SphereTest.h | 2 +- src/Platform/ExtensionWrangler.cpp | 1 + src/Primitives/Test/CapsuleTest.h | 2 +- src/Primitives/Test/CylinderTest.h | 2 +- src/Primitives/Test/UVSphereTest.h | 2 +- src/Profiler.cpp | 2 +- src/Resource.h | 1 + src/SceneGraph/FeatureGroup.h | 2 +- src/SceneGraph/Test/CameraTest.h | 2 +- src/SceneGraph/Test/ObjectTest.h | 2 +- src/SceneGraph/Test/SceneTest.h | 2 +- src/Shader.cpp | 2 +- src/Test/ArrayTest.h | 2 +- src/Test/ColorTest.h | 2 +- src/Test/MeshTest.h | 2 +- src/Test/ResourceManagerTest.h | 2 +- src/Test/SwizzleTest.h | 2 +- src/Test/TypeTraitsTest.h | 2 +- 56 files changed, 57 insertions(+), 52 deletions(-) diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index 04f14f2b6..84b2b82eb 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -15,7 +15,7 @@ #include "AbstractImage.h" -#include +#include #include "TypeTraits.h" diff --git a/src/Implementation/BufferState.cpp b/src/Implementation/BufferState.cpp index 229be3504..323f5a015 100644 --- a/src/Implementation/BufferState.cpp +++ b/src/Implementation/BufferState.cpp @@ -15,7 +15,7 @@ #include "BufferState.h" -#include +#include namespace Magnum { namespace Implementation { diff --git a/src/Math/Algorithms/Test/GaussJordanTest.h b/src/Math/Algorithms/Test/GaussJordanTest.h index 0c25d27e0..fb5389cf9 100644 --- a/src/Math/Algorithms/Test/GaussJordanTest.h +++ b/src/Math/Algorithms/Test/GaussJordanTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Algorithms { namespace Test { -class GaussJordanTest: public Corrade::TestSuite::Tester { +class GaussJordanTest: public Corrade::TestSuite::Tester { public: GaussJordanTest(); diff --git a/src/Math/Geometry/Test/DistanceTest.h b/src/Math/Geometry/Test/DistanceTest.h index dc7c7bc88..485e1d576 100644 --- a/src/Math/Geometry/Test/DistanceTest.h +++ b/src/Math/Geometry/Test/DistanceTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Geometry { namespace Test { -class DistanceTest: public Corrade::TestSuite::Tester { +class DistanceTest: public Corrade::TestSuite::Tester { public: DistanceTest(); diff --git a/src/Math/Geometry/Test/IntersectionTest.h b/src/Math/Geometry/Test/IntersectionTest.h index 7187a28c2..7375b2d51 100644 --- a/src/Math/Geometry/Test/IntersectionTest.h +++ b/src/Math/Geometry/Test/IntersectionTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Geometry { namespace Test { -class IntersectionTest: public Corrade::TestSuite::Tester { +class IntersectionTest: public Corrade::TestSuite::Tester { public: IntersectionTest(); diff --git a/src/Math/Test/ConstantsTest.h b/src/Math/Test/ConstantsTest.h index a52c49543..3a96e0c35 100644 --- a/src/Math/Test/ConstantsTest.h +++ b/src/Math/Test/ConstantsTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class ConstantsTest: public Corrade::TestSuite::Tester { +class ConstantsTest: public Corrade::TestSuite::Tester { public: ConstantsTest(); diff --git a/src/Math/Test/MathTest.h b/src/Math/Test/MathTest.h index 658d47690..3f16d33d9 100644 --- a/src/Math/Test/MathTest.h +++ b/src/Math/Test/MathTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class MathTest: public Corrade::TestSuite::Tester { +class MathTest: public Corrade::TestSuite::Tester { public: MathTest(); diff --git a/src/Math/Test/MathTypeTraitsTest.h b/src/Math/Test/MathTypeTraitsTest.h index 76a4f8882..5baa9da49 100644 --- a/src/Math/Test/MathTypeTraitsTest.h +++ b/src/Math/Test/MathTypeTraitsTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class MathTypeTraitsTest: public Corrade::TestSuite::Tester { +class MathTypeTraitsTest: public Corrade::TestSuite::Tester { public: MathTypeTraitsTest(); diff --git a/src/Math/Test/Matrix3Test.h b/src/Math/Test/Matrix3Test.h index ede0d7fca..0b189e726 100644 --- a/src/Math/Test/Matrix3Test.h +++ b/src/Math/Test/Matrix3Test.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Matrix3Test: public Corrade::TestSuite::Tester { +class Matrix3Test: public Corrade::TestSuite::Tester { public: Matrix3Test(); diff --git a/src/Math/Test/Matrix4Test.h b/src/Math/Test/Matrix4Test.h index 7c360f618..f00ac7393 100644 --- a/src/Math/Test/Matrix4Test.h +++ b/src/Math/Test/Matrix4Test.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Matrix4Test: public Corrade::TestSuite::Tester { +class Matrix4Test: public Corrade::TestSuite::Tester { public: Matrix4Test(); diff --git a/src/Math/Test/MatrixTest.h b/src/Math/Test/MatrixTest.h index ba1cb02ee..a3c6f53ea 100644 --- a/src/Math/Test/MatrixTest.h +++ b/src/Math/Test/MatrixTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class MatrixTest: public Corrade::TestSuite::Tester { +class MatrixTest: public Corrade::TestSuite::Tester { public: MatrixTest(); diff --git a/src/Math/Test/Point2DTest.h b/src/Math/Test/Point2DTest.h index 39ec72d3b..8baf04980 100644 --- a/src/Math/Test/Point2DTest.h +++ b/src/Math/Test/Point2DTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Point2DTest: public Corrade::TestSuite::Tester { +class Point2DTest: public Corrade::TestSuite::Tester { public: Point2DTest(); diff --git a/src/Math/Test/Point3DTest.h b/src/Math/Test/Point3DTest.h index 9560e01d5..54518afa7 100644 --- a/src/Math/Test/Point3DTest.h +++ b/src/Math/Test/Point3DTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Point3DTest: public Corrade::TestSuite::Tester { +class Point3DTest: public Corrade::TestSuite::Tester { public: Point3DTest(); diff --git a/src/Math/Test/RectangularMatrixTest.h b/src/Math/Test/RectangularMatrixTest.h index 469762177..34754f583 100644 --- a/src/Math/Test/RectangularMatrixTest.h +++ b/src/Math/Test/RectangularMatrixTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class RectangularMatrixTest: public Corrade::TestSuite::Tester { +class RectangularMatrixTest: public Corrade::TestSuite::Tester { public: RectangularMatrixTest(); diff --git a/src/Math/Test/Vector2Test.h b/src/Math/Test/Vector2Test.h index 1e35c4704..b9cc71797 100644 --- a/src/Math/Test/Vector2Test.h +++ b/src/Math/Test/Vector2Test.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Vector2Test: public Corrade::TestSuite::Tester { +class Vector2Test: public Corrade::TestSuite::Tester { public: Vector2Test(); diff --git a/src/Math/Test/Vector3Test.h b/src/Math/Test/Vector3Test.h index 706b3c68a..23ecd5db5 100644 --- a/src/Math/Test/Vector3Test.h +++ b/src/Math/Test/Vector3Test.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Vector3Test: public Corrade::TestSuite::Tester { +class Vector3Test: public Corrade::TestSuite::Tester { public: Vector3Test(); diff --git a/src/Math/Test/Vector4Test.h b/src/Math/Test/Vector4Test.h index 7e8cc5ae2..95b41c986 100644 --- a/src/Math/Test/Vector4Test.h +++ b/src/Math/Test/Vector4Test.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class Vector4Test: public Corrade::TestSuite::Tester { +class Vector4Test: public Corrade::TestSuite::Tester { public: Vector4Test(); diff --git a/src/Math/Test/VectorTest.h b/src/Math/Test/VectorTest.h index ca8f48e48..6c70e6e02 100644 --- a/src/Math/Test/VectorTest.h +++ b/src/Math/Test/VectorTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Math { namespace Test { -class VectorTest: public Corrade::TestSuite::Tester { +class VectorTest: public Corrade::TestSuite::Tester { public: VectorTest(); diff --git a/src/Math/Vector.h b/src/Math/Vector.h index 3ed1f71b3..1f315d9fd 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -19,6 +19,8 @@ * @brief Class Magnum::Math::Vector */ +#include + #include "RectangularMatrix.h" namespace Magnum { namespace Math { diff --git a/src/Mesh.h b/src/Mesh.h index a7bcc2286..9c65327f5 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -20,7 +20,7 @@ */ #include -#include +#include #include "AbstractShaderProgram.h" #include "TypeTraits.h" diff --git a/src/MeshTools/Test/CleanTest.h b/src/MeshTools/Test/CleanTest.h index 57169d736..2b6b797ef 100644 --- a/src/MeshTools/Test/CleanTest.h +++ b/src/MeshTools/Test/CleanTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class CleanTest: public Corrade::TestSuite::Tester { +class CleanTest: public Corrade::TestSuite::Tester { public: CleanTest(); diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.h b/src/MeshTools/Test/CombineIndexedArraysTest.h index df90f02f8..80b08c418 100644 --- a/src/MeshTools/Test/CombineIndexedArraysTest.h +++ b/src/MeshTools/Test/CombineIndexedArraysTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class CombineIndexedArraysTest: public Corrade::TestSuite::Tester { +class CombineIndexedArraysTest: public Corrade::TestSuite::Tester { public: CombineIndexedArraysTest(); diff --git a/src/MeshTools/Test/CompressIndicesTest.h b/src/MeshTools/Test/CompressIndicesTest.h index fcbcc85dd..187610326 100644 --- a/src/MeshTools/Test/CompressIndicesTest.h +++ b/src/MeshTools/Test/CompressIndicesTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class CompressIndicesTest: public Corrade::TestSuite::Tester { +class CompressIndicesTest: public Corrade::TestSuite::Tester { public: CompressIndicesTest(); diff --git a/src/MeshTools/Test/FlipNormalsTest.h b/src/MeshTools/Test/FlipNormalsTest.h index f6f0422cd..8a25d8bed 100644 --- a/src/MeshTools/Test/FlipNormalsTest.h +++ b/src/MeshTools/Test/FlipNormalsTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class FlipNormalsTest: public Corrade::TestSuite::Tester { +class FlipNormalsTest: public Corrade::TestSuite::Tester { public: FlipNormalsTest(); diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.h b/src/MeshTools/Test/GenerateFlatNormalsTest.h index 130636498..b699e991e 100644 --- a/src/MeshTools/Test/GenerateFlatNormalsTest.h +++ b/src/MeshTools/Test/GenerateFlatNormalsTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class GenerateFlatNormalsTest: public Corrade::TestSuite::Tester { +class GenerateFlatNormalsTest: public Corrade::TestSuite::Tester { public: GenerateFlatNormalsTest(); diff --git a/src/MeshTools/Test/InterleaveTest.h b/src/MeshTools/Test/InterleaveTest.h index e360d0554..19aae30fb 100644 --- a/src/MeshTools/Test/InterleaveTest.h +++ b/src/MeshTools/Test/InterleaveTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class InterleaveTest: public Corrade::TestSuite::Tester { +class InterleaveTest: public Corrade::TestSuite::Tester { public: InterleaveTest(); diff --git a/src/MeshTools/Test/SubdivideTest.h b/src/MeshTools/Test/SubdivideTest.h index b5ff7f0ef..9d1521a9c 100644 --- a/src/MeshTools/Test/SubdivideTest.h +++ b/src/MeshTools/Test/SubdivideTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class SubdivideTest: public Corrade::TestSuite::Tester { +class SubdivideTest: public Corrade::TestSuite::Tester { public: SubdivideTest(); diff --git a/src/MeshTools/Test/TipsifyTest.h b/src/MeshTools/Test/TipsifyTest.h index 37ca6d4fb..5e4952430 100644 --- a/src/MeshTools/Test/TipsifyTest.h +++ b/src/MeshTools/Test/TipsifyTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace MeshTools { namespace Test { -class TipsifyTest: public Corrade::TestSuite::Tester { +class TipsifyTest: public Corrade::TestSuite::Tester { public: TipsifyTest(); diff --git a/src/Physics/ShapeGroup.h b/src/Physics/ShapeGroup.h index d1ed8bce6..0c89901a7 100644 --- a/src/Physics/ShapeGroup.h +++ b/src/Physics/ShapeGroup.h @@ -21,6 +21,7 @@ #include "AbstractShape.h" +#include #include #include diff --git a/src/Physics/Test/AbstractShapeTest.h b/src/Physics/Test/AbstractShapeTest.h index 1fa4c4531..4272b72d5 100644 --- a/src/Physics/Test/AbstractShapeTest.h +++ b/src/Physics/Test/AbstractShapeTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class AbstractShapeTest: public Corrade::TestSuite::Tester { +class AbstractShapeTest: public Corrade::TestSuite::Tester { public: AbstractShapeTest(); diff --git a/src/Physics/Test/AxisAlignedBoxTest.h b/src/Physics/Test/AxisAlignedBoxTest.h index bbbbd1083..63451a508 100644 --- a/src/Physics/Test/AxisAlignedBoxTest.h +++ b/src/Physics/Test/AxisAlignedBoxTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class AxisAlignedBoxTest: public Corrade::TestSuite::Tester { +class AxisAlignedBoxTest: public Corrade::TestSuite::Tester { public: AxisAlignedBoxTest(); diff --git a/src/Physics/Test/BoxTest.h b/src/Physics/Test/BoxTest.h index 48781ad08..abf67ce52 100644 --- a/src/Physics/Test/BoxTest.h +++ b/src/Physics/Test/BoxTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class BoxTest: public Corrade::TestSuite::Tester { +class BoxTest: public Corrade::TestSuite::Tester { public: BoxTest(); diff --git a/src/Physics/Test/CapsuleTest.h b/src/Physics/Test/CapsuleTest.h index 88dec80df..6c6c969a1 100644 --- a/src/Physics/Test/CapsuleTest.h +++ b/src/Physics/Test/CapsuleTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class CapsuleTest: public Corrade::TestSuite::Tester, ShapeTestBase { +class CapsuleTest: public Corrade::TestSuite::Tester, ShapeTestBase { public: CapsuleTest(); diff --git a/src/Physics/Test/LineTest.h b/src/Physics/Test/LineTest.h index fd264747b..8f33c3245 100644 --- a/src/Physics/Test/LineTest.h +++ b/src/Physics/Test/LineTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class LineTest: public Corrade::TestSuite::Tester { +class LineTest: public Corrade::TestSuite::Tester { public: LineTest(); diff --git a/src/Physics/Test/ObjectShapeTest.h b/src/Physics/Test/ObjectShapeTest.h index 65d051da1..6a3f0b398 100644 --- a/src/Physics/Test/ObjectShapeTest.h +++ b/src/Physics/Test/ObjectShapeTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class ObjectShapeTest: public Corrade::TestSuite::Tester { +class ObjectShapeTest: public Corrade::TestSuite::Tester { public: ObjectShapeTest(); diff --git a/src/Physics/Test/PlaneTest.h b/src/Physics/Test/PlaneTest.h index 4381e3dc6..d685917e4 100644 --- a/src/Physics/Test/PlaneTest.h +++ b/src/Physics/Test/PlaneTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class PlaneTest: public Corrade::TestSuite::Tester, ShapeTestBase { +class PlaneTest: public Corrade::TestSuite::Tester, ShapeTestBase { public: PlaneTest(); diff --git a/src/Physics/Test/PointTest.h b/src/Physics/Test/PointTest.h index f158954fb..529ffbd9e 100644 --- a/src/Physics/Test/PointTest.h +++ b/src/Physics/Test/PointTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class PointTest: public Corrade::TestSuite::Tester { +class PointTest: public Corrade::TestSuite::Tester { public: PointTest(); diff --git a/src/Physics/Test/ShapeGroupTest.h b/src/Physics/Test/ShapeGroupTest.h index 7e12a3633..49c93a949 100644 --- a/src/Physics/Test/ShapeGroupTest.h +++ b/src/Physics/Test/ShapeGroupTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class ShapeGroupTest: public Corrade::TestSuite::Tester { +class ShapeGroupTest: public Corrade::TestSuite::Tester { public: ShapeGroupTest(); diff --git a/src/Physics/Test/SphereTest.h b/src/Physics/Test/SphereTest.h index 48a2d2d3c..a8fa7ef0b 100644 --- a/src/Physics/Test/SphereTest.h +++ b/src/Physics/Test/SphereTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Physics { namespace Test { -class SphereTest: public Corrade::TestSuite::Tester, ShapeTestBase { +class SphereTest: public Corrade::TestSuite::Tester, ShapeTestBase { public: SphereTest(); diff --git a/src/Platform/ExtensionWrangler.cpp b/src/Platform/ExtensionWrangler.cpp index c84795546..1216075a8 100644 --- a/src/Platform/ExtensionWrangler.cpp +++ b/src/Platform/ExtensionWrangler.cpp @@ -15,6 +15,7 @@ #include "ExtensionWrangler.h" +#include #include #include "Magnum.h" diff --git a/src/Primitives/Test/CapsuleTest.h b/src/Primitives/Test/CapsuleTest.h index e8bc1f495..ab276ae4f 100644 --- a/src/Primitives/Test/CapsuleTest.h +++ b/src/Primitives/Test/CapsuleTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Primitives { namespace Test { -class CapsuleTest: public Corrade::TestSuite::Tester { +class CapsuleTest: public Corrade::TestSuite::Tester { public: CapsuleTest(); diff --git a/src/Primitives/Test/CylinderTest.h b/src/Primitives/Test/CylinderTest.h index 0d575bc23..48234fb99 100644 --- a/src/Primitives/Test/CylinderTest.h +++ b/src/Primitives/Test/CylinderTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Primitives { namespace Test { -class CylinderTest: public Corrade::TestSuite::Tester { +class CylinderTest: public Corrade::TestSuite::Tester { public: CylinderTest(); diff --git a/src/Primitives/Test/UVSphereTest.h b/src/Primitives/Test/UVSphereTest.h index 8afd27522..560cb9d4c 100644 --- a/src/Primitives/Test/UVSphereTest.h +++ b/src/Primitives/Test/UVSphereTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Primitives { namespace Test { -class UVSphereTest: public Corrade::TestSuite::Tester { +class UVSphereTest: public Corrade::TestSuite::Tester { public: UVSphereTest(); diff --git a/src/Profiler.cpp b/src/Profiler.cpp index dcede5b73..8e4178fcf 100644 --- a/src/Profiler.cpp +++ b/src/Profiler.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include using namespace std; diff --git a/src/Resource.h b/src/Resource.h index 33085cb7c..b4abf8196 100644 --- a/src/Resource.h +++ b/src/Resource.h @@ -19,6 +19,7 @@ * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState */ +#include #include #include "Magnum.h" diff --git a/src/SceneGraph/FeatureGroup.h b/src/SceneGraph/FeatureGroup.h index 6ff5cd9c7..914b4dd0c 100644 --- a/src/SceneGraph/FeatureGroup.h +++ b/src/SceneGraph/FeatureGroup.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "SceneGraph.h" diff --git a/src/SceneGraph/Test/CameraTest.h b/src/SceneGraph/Test/CameraTest.h index 1a9ab9198..b43ec879b 100644 --- a/src/SceneGraph/Test/CameraTest.h +++ b/src/SceneGraph/Test/CameraTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace SceneGraph { namespace Test { -class CameraTest: public Corrade::TestSuite::Tester { +class CameraTest: public Corrade::TestSuite::Tester { public: CameraTest(); diff --git a/src/SceneGraph/Test/ObjectTest.h b/src/SceneGraph/Test/ObjectTest.h index 7a04a1bd5..0c2e594d9 100644 --- a/src/SceneGraph/Test/ObjectTest.h +++ b/src/SceneGraph/Test/ObjectTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace SceneGraph { namespace Test { -class ObjectTest: public Corrade::TestSuite::Tester { +class ObjectTest: public Corrade::TestSuite::Tester { public: ObjectTest(); diff --git a/src/SceneGraph/Test/SceneTest.h b/src/SceneGraph/Test/SceneTest.h index 6d1af5c9b..93aef48a7 100644 --- a/src/SceneGraph/Test/SceneTest.h +++ b/src/SceneGraph/Test/SceneTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace SceneGraph { namespace Test { -class SceneTest: public Corrade::TestSuite::Tester { +class SceneTest: public Corrade::TestSuite::Tester { public: SceneTest(); diff --git a/src/Shader.cpp b/src/Shader.cpp index 5695b383a..c23d66adf 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -16,7 +16,7 @@ #include "Shader.h" #include -#include +#include #define COMPILER_MESSAGE_MAX_LENGTH 1024 diff --git a/src/Test/ArrayTest.h b/src/Test/ArrayTest.h index f90059f40..eab504e9b 100644 --- a/src/Test/ArrayTest.h +++ b/src/Test/ArrayTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class ArrayTest: public Corrade::TestSuite::Tester { +class ArrayTest: public Corrade::TestSuite::Tester { public: ArrayTest(); diff --git a/src/Test/ColorTest.h b/src/Test/ColorTest.h index 172211f29..27991ea3d 100644 --- a/src/Test/ColorTest.h +++ b/src/Test/ColorTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class ColorTest: public Corrade::TestSuite::Tester { +class ColorTest: public Corrade::TestSuite::Tester { public: ColorTest(); diff --git a/src/Test/MeshTest.h b/src/Test/MeshTest.h index 051488fbf..4b40a3f69 100644 --- a/src/Test/MeshTest.h +++ b/src/Test/MeshTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class MeshTest: public Corrade::TestSuite::Tester { +class MeshTest: public Corrade::TestSuite::Tester { public: MeshTest(); diff --git a/src/Test/ResourceManagerTest.h b/src/Test/ResourceManagerTest.h index fa95ec724..35aa5aa0a 100644 --- a/src/Test/ResourceManagerTest.h +++ b/src/Test/ResourceManagerTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class ResourceManagerTest: public Corrade::TestSuite::Tester { +class ResourceManagerTest: public Corrade::TestSuite::Tester { public: ResourceManagerTest(); diff --git a/src/Test/SwizzleTest.h b/src/Test/SwizzleTest.h index 56a705f5d..d9b581517 100644 --- a/src/Test/SwizzleTest.h +++ b/src/Test/SwizzleTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class SwizzleTest: public Corrade::TestSuite::Tester { +class SwizzleTest: public Corrade::TestSuite::Tester { public: SwizzleTest(); diff --git a/src/Test/TypeTraitsTest.h b/src/Test/TypeTraitsTest.h index 2f634f50c..d39a42265 100644 --- a/src/Test/TypeTraitsTest.h +++ b/src/Test/TypeTraitsTest.h @@ -19,7 +19,7 @@ namespace Magnum { namespace Test { -class TypeTraitsTest: public Corrade::TestSuite::Tester { +class TypeTraitsTest: public Corrade::TestSuite::Tester { public: TypeTraitsTest();