diff --git a/src/Magnum/Math/Test/BezierTest.cpp b/src/Magnum/Math/Test/BezierTest.cpp index e2ac177f3..c7a6f41ed 100644 --- a/src/Magnum/Math/Test/BezierTest.cpp +++ b/src/Magnum/Math/Test/BezierTest.cpp @@ -58,14 +58,6 @@ template<> struct BezierConverter<2, 2, Float, QBezier2D> { namespace Test { namespace { -/* What's a typedef and not a using differs from the typedefs in root Magnum - namespace, or is not present there at all */ -using Magnum::Vector2; -typedef Math::Bezier<1, 2, Float> LinearBezier2D; -using Magnum::QuadraticBezier2D; -using Magnum::CubicBezier2D; -using Magnum::CubicHermite2D; - struct BezierTest: TestSuite::Tester { explicit BezierTest(); @@ -93,6 +85,14 @@ struct BezierTest: TestSuite::Tester { void debug(); }; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ +using Magnum::Vector2; +typedef Math::Bezier<1, 2, Float> LinearBezier2D; +using Magnum::QuadraticBezier2D; +using Magnum::CubicBezier2D; +using Magnum::CubicHermite2D; + BezierTest::BezierTest() { addTests({&BezierTest::construct, &BezierTest::constructDefault, diff --git a/src/Magnum/Math/Test/BitVectorTest.cpp b/src/Magnum/Math/Test/BitVectorTest.cpp index 742a736d3..9334f8fd9 100644 --- a/src/Magnum/Math/Test/BitVectorTest.cpp +++ b/src/Magnum/Math/Test/BitVectorTest.cpp @@ -87,6 +87,8 @@ static_assert(BitVector<15>::DataSize == 2, "Improper DataSize"); static_assert(BitVector<16>::DataSize == 2, "Improper DataSize"); static_assert(BitVector<17>::DataSize == 3, "Improper DataSize"); +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ typedef Math::BitVector<19> BitVector19; BitVectorTest::BitVectorTest() { diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index 218e110bc..7cc59d327 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -107,6 +107,17 @@ struct ComplexTest: TestSuite::Tester { void debug(); }; +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Complex; +using Magnum::Vector2; +using Magnum::Matrix3; +using Magnum::Matrix2x2; + ComplexTest::ComplexTest() { addTests({&ComplexTest::construct, &ComplexTest::constructIdentity, @@ -161,15 +172,6 @@ ComplexTest::ComplexTest() { &ComplexTest::debug}); } -using Magnum::Deg; -using Magnum::Rad; -using Magnum::Complex; -using Magnum::Vector2; -using Magnum::Matrix3; -using Magnum::Matrix2x2; - -using namespace Math::Literals; - void ComplexTest::construct() { constexpr Complex a = {0.5f, -3.7f}; CORRADE_COMPARE(a, Complex(0.5f, -3.7f)); diff --git a/src/Magnum/Math/Test/CubicHermiteTest.cpp b/src/Magnum/Math/Test/CubicHermiteTest.cpp index 5f947785e..d20f84ac6 100644 --- a/src/Magnum/Math/Test/CubicHermiteTest.cpp +++ b/src/Magnum/Math/Test/CubicHermiteTest.cpp @@ -124,6 +124,20 @@ struct CubicHermiteTest: TestSuite::Tester { void debugQuaternion(); }; +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Complex; +using Magnum::Quaternion; +using Magnum::CubicBezier2D; +using Magnum::CubicHermite1D; +using Magnum::CubicHermite2D; +using Magnum::CubicHermiteComplex; +using Magnum::CubicHermiteQuaternion; + CubicHermiteTest::CubicHermiteTest() { addTests({&CubicHermiteTest::constructScalar, &CubicHermiteTest::constructVector, @@ -209,18 +223,6 @@ CubicHermiteTest::CubicHermiteTest() { &CubicHermiteTest::debugQuaternion}); } -using namespace Math::Literals; - -using Magnum::Vector2; -using Magnum::Vector3; -using Magnum::Complex; -using Magnum::Quaternion; -using Magnum::CubicBezier2D; -using Magnum::CubicHermite1D; -using Magnum::CubicHermite2D; -using Magnum::CubicHermiteComplex; -using Magnum::CubicHermiteQuaternion; - void CubicHermiteTest::constructScalar() { constexpr CubicHermite1D a{2.0f, -2.0f, -0.5f}; CubicHermite1D b{2.0f, -2.0f, -0.5f}; diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index a146b1784..3b949d8b5 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -103,7 +103,7 @@ struct DualComplexTest: TestSuite::Tester { void debug(); }; -using namespace Math::Literals; +using namespace Literals; /* What's a typedef and not a using differs from the typedefs in root Magnum namespace, or is not present there at all */ diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index e4f869445..db22d0c99 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -70,6 +70,8 @@ struct DualTest: TestSuite::Tester { void debug(); }; +using namespace Literals; + /* What's a typedef and not a using differs from the typedefs in root Magnum namespace, or is not present there at all */ typedef Math::Dual Dual; @@ -79,8 +81,6 @@ using Magnum::Deg; using Magnum::Rad; using Magnum::Constants; -using namespace Literals; - DualTest::DualTest() { addTests({&DualTest::construct, &DualTest::constructDefault, diff --git a/src/Magnum/Math/Test/FrustumTest.cpp b/src/Magnum/Math/Test/FrustumTest.cpp index bb4b8e027..fb8e7d032 100644 --- a/src/Magnum/Math/Test/FrustumTest.cpp +++ b/src/Magnum/Math/Test/FrustumTest.cpp @@ -88,6 +88,10 @@ struct FrustumTest: TestSuite::Tester { void debug(); }; +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Vector4; using Magnum::Matrix4; using Magnum::Frustum; @@ -258,8 +262,6 @@ void FrustumTest::constructCopy() { } void FrustumTest::constructFromMatrix() { - using namespace Magnum::Math::Literals; - Frustum expected{ { 1.0f, 0.0f, -1.0f, 0.0f}, {-1.0f, 0.0f, -1.0f, 0.0f}, diff --git a/src/Magnum/Math/Test/InterpolationBenchmark.cpp b/src/Magnum/Math/Test/InterpolationBenchmark.cpp index 5b928f79a..ce2013b0b 100644 --- a/src/Magnum/Math/Test/InterpolationBenchmark.cpp +++ b/src/Magnum/Math/Test/InterpolationBenchmark.cpp @@ -46,12 +46,6 @@ struct InterpolationBenchmark: TestSuite::Tester { void dualQuaternionSclerpShortestPath(); }; -using namespace Math::Literals; - -using Magnum::Quaternion; -using Magnum::DualQuaternion; -using Magnum::Vector3; - InterpolationBenchmark::InterpolationBenchmark() { addBenchmarks({&InterpolationBenchmark::baseline, &InterpolationBenchmark::quaternionLerp, @@ -62,6 +56,14 @@ InterpolationBenchmark::InterpolationBenchmark() { &InterpolationBenchmark::dualQuaternionSclerpShortestPath}, 100); } +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace */ +using Magnum::Quaternion; +using Magnum::DualQuaternion; +using Magnum::Vector3; + void InterpolationBenchmark::baseline() { Quaternion c; Float t = 0.0f; diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index 6f9c64848..9419faa1c 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -133,6 +133,10 @@ struct QuaternionTest: TestSuite::Tester { void debug(); }; +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Deg; using Magnum::Rad; using Magnum::Matrix3x3; @@ -142,8 +146,6 @@ using Magnum::Vector2; using Magnum::Vector3; using Magnum::Vector4; -using namespace Math::Literals; - QuaternionTest::QuaternionTest() { addTests({&QuaternionTest::construct, &QuaternionTest::constructIdentity, diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 58ab9087e..124c9c2d7 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -150,6 +150,8 @@ struct RangeTest: TestSuite::Tester { void debugPacked(); }; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Range1D; using Magnum::Range2D; using Magnum::Range3D; diff --git a/src/Magnum/Math/Test/TimeStlTest.cpp b/src/Magnum/Math/Test/TimeStlTest.cpp index 6b5de3126..32adc4ec8 100644 --- a/src/Magnum/Math/Test/TimeStlTest.cpp +++ b/src/Magnum/Math/Test/TimeStlTest.cpp @@ -44,9 +44,11 @@ TimeStlTest::TimeStlTest() { &TimeStlTest::chronoTimePoint}); } -using Magnum::Nanoseconds; +using namespace Literals; -using namespace Math::Literals; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace */ +using Magnum::Nanoseconds; void TimeStlTest::chronoDurationTypedefs() { /* Negative values should work as well */ diff --git a/src/Magnum/Math/Test/TimeTest.cpp b/src/Magnum/Math/Test/TimeTest.cpp index 863730a03..c533247c2 100644 --- a/src/Magnum/Math/Test/TimeTest.cpp +++ b/src/Magnum/Math/Test/TimeTest.cpp @@ -85,11 +85,13 @@ struct TimeTest: TestSuite::Tester { void debugSecondsPacked(); }; +using namespace Literals; + +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace */ using Magnum::Nanoseconds; using Magnum::Seconds; -using namespace Math::Literals; - TimeTest::TimeTest() { addTests({&TimeTest::limits, diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp index e942a9ddd..31049e119 100644 --- a/src/Magnum/Math/Test/Vector2Test.cpp +++ b/src/Magnum/Math/Test/Vector2Test.cpp @@ -83,6 +83,8 @@ struct Vector2Test: TestSuite::Tester { void debug(); }; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Vector2; Vector2Test::Vector2Test() { diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp index c6cabc1cc..1eb93ac01 100644 --- a/src/Magnum/Math/Test/Vector3Test.cpp +++ b/src/Magnum/Math/Test/Vector3Test.cpp @@ -83,6 +83,8 @@ struct Vector3Test: TestSuite::Tester { void debug(); }; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Vector3; using Magnum::Vector2; diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp index 29f62fbff..a4395b6ca 100644 --- a/src/Magnum/Math/Test/Vector4Test.cpp +++ b/src/Magnum/Math/Test/Vector4Test.cpp @@ -85,6 +85,8 @@ struct Vector4Test: TestSuite::Tester { void debug(); }; +/* What's a typedef and not a using differs from the typedefs in root Magnum + namespace, or is not present there at all */ using Magnum::Vector4; using Magnum::Vector3; using Magnum::Vector2; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 63d5ffb98..7ec29ed0a 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -129,6 +129,8 @@ struct VectorTest: TestSuite::Tester { void debugPropagateFlags(); }; +using namespace Literals; + /* What's a typedef and not a using differs from the typedefs in root Magnum namespace */ using Magnum::Constants; @@ -145,8 +147,6 @@ typedef Vector<3, Half> Vector3h; typedef Vector<3, Int> Vector3i; typedef Vector<2, Int> Vector2i; -using namespace Literals; - VectorTest::VectorTest() { addTests({&VectorTest::construct, &VectorTest::constructFromData,