From 59bb7b8cd5912346b589cc199b7e5d83b15690e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Sep 2023 16:28:47 +0200 Subject: [PATCH] Adapt to Corrade changes. --- src/Magnum/Math/Test/AngleTest.cpp | 4 ++-- src/Magnum/Math/Test/BezierTest.cpp | 4 ++-- src/Magnum/Math/Test/BitVectorTest.cpp | 4 ++-- src/Magnum/Math/Test/ColorTest.cpp | 4 ++-- src/Magnum/Math/Test/ComplexTest.cpp | 4 ++-- src/Magnum/Math/Test/CubicHermiteTest.cpp | 10 +++++----- src/Magnum/Math/Test/DualComplexTest.cpp | 4 ++-- src/Magnum/Math/Test/DualQuaternionTest.cpp | 4 ++-- src/Magnum/Math/Test/DualTest.cpp | 4 ++-- src/Magnum/Math/Test/FrustumTest.cpp | 4 ++-- src/Magnum/Math/Test/HalfTest.cpp | 4 ++-- src/Magnum/Math/Test/Matrix3Test.cpp | 4 ++-- src/Magnum/Math/Test/Matrix4Test.cpp | 4 ++-- src/Magnum/Math/Test/MatrixTest.cpp | 8 ++++---- src/Magnum/Math/Test/QuaternionTest.cpp | 4 ++-- src/Magnum/Math/Test/RangeTest.cpp | 4 ++-- src/Magnum/Math/Test/RectangularMatrixTest.cpp | 4 ++-- src/Magnum/Math/Test/UnitTest.cpp | 4 ++-- src/Magnum/Math/Test/Vector2Test.cpp | 4 ++-- src/Magnum/Math/Test/Vector3Test.cpp | 4 ++-- src/Magnum/Math/Test/Vector4Test.cpp | 4 ++-- src/Magnum/Math/Test/VectorTest.cpp | 4 ++-- 22 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp index d0898a4af..9fb4c9290 100644 --- a/src/Magnum/Math/Test/AngleTest.cpp +++ b/src/Magnum/Math/Test/AngleTest.cpp @@ -34,7 +34,7 @@ #include #include #endif -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Angle.h" @@ -270,7 +270,7 @@ void AngleTest::constructCopy() { constexpr Radd d(b); CORRADE_COMPARE(d, b); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); diff --git a/src/Magnum/Math/Test/BezierTest.cpp b/src/Magnum/Math/Test/BezierTest.cpp index 080dc6673..05c4aae77 100644 --- a/src/Magnum/Math/Test/BezierTest.cpp +++ b/src/Magnum/Math/Test/BezierTest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Bezier.h" #include "Magnum/Math/CubicHermite.h" @@ -189,7 +189,7 @@ void BezierTest::constructCopy() { constexpr QuadraticBezier2D b{a}; CORRADE_COMPARE(b, (QuadraticBezier2D{Vector2{0.5f, 1.0f}, Vector2{1.1f, 0.3f}, Vector2{0.1f, 1.2f}})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/BitVectorTest.cpp b/src/Magnum/Math/Test/BitVectorTest.cpp index df57278fd..2cfd6ba85 100644 --- a/src/Magnum/Math/Test/BitVectorTest.cpp +++ b/src/Magnum/Math/Test/BitVectorTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/BitVector.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -180,7 +180,7 @@ void BitVectorTest::constructCopy() { constexpr BitVector19 b(a); CORRADE_COMPARE(b, BitVector19(0xa5, 0x5f, 0x07)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/ColorTest.cpp b/src/Magnum/Math/Test/ColorTest.cpp index 88a44ca52..f88adf23d 100644 --- a/src/Magnum/Math/Test/ColorTest.cpp +++ b/src/Magnum/Math/Test/ColorTest.cpp @@ -32,7 +32,7 @@ #include #include #endif -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Color.h" #include "Magnum/Math/Half.h" @@ -457,7 +457,7 @@ void ColorTest::constructCopy() { Color4 d(c); CORRADE_COMPARE(d, Color4(1.0f, 0.5f, 0.75f, 0.25f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index e7d2e6798..df6b5103e 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Complex.h" #include "Magnum/Math/Matrix3.h" @@ -257,7 +257,7 @@ void ComplexTest::constructCopy() { constexpr Complex b(a); CORRADE_COMPARE(b, Complex(2.5f, -5.0f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/CubicHermiteTest.cpp b/src/Magnum/Math/Test/CubicHermiteTest.cpp index 95ef55969..18b227f99 100644 --- a/src/Magnum/Math/Test/CubicHermiteTest.cpp +++ b/src/Magnum/Math/Test/CubicHermiteTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Bezier.h" #include "Magnum/Math/CubicHermite.h" @@ -601,7 +601,7 @@ void CubicHermiteTest::constructCopyScalar() { CORRADE_COMPARE(b, (CubicHermite1D{2.0f, -2.0f, -0.5f})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif @@ -615,7 +615,7 @@ void CubicHermiteTest::constructCopyVector() { CORRADE_COMPARE(b, (CubicHermite2D{{1.0f, 2.0f}, {1.5f, -2.0f}, {3.0f, -0.5f}})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif @@ -629,7 +629,7 @@ void CubicHermiteTest::constructCopyComplex() { CORRADE_COMPARE(b, (CubicHermiteComplex{{1.0f, 2.0f}, {1.5f, -2.0f}, {3.0f, -0.5f}})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif @@ -649,7 +649,7 @@ void CubicHermiteTest::constructCopyQuaternion() { {{1.5f, -2.0f, 0.1f}, 1.1f}, {{3.0f, -0.5f, 1.2f}, 0.3f}})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index 9cbb32484..fe576105e 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/DualComplex.h" #include "Magnum/Math/DualQuaternion.h" @@ -250,7 +250,7 @@ void DualComplexTest::constructCopy() { DualComplex b(a); CORRADE_COMPARE(b, DualComplex({-1.0f, 2.5f}, {3.0f, -7.5f})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp index 3569b6882..0809d59d7 100644 --- a/src/Magnum/Math/Test/DualQuaternionTest.cpp +++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/DualQuaternion.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -279,7 +279,7 @@ void DualQuaternionTest::constructCopy() { DualQuaternion b(a); CORRADE_COMPARE(b, DualQuaternion({{1.0f, 2.0f, -3.0f}, -3.5f}, {{4.5f, -7.0f, 2.0f}, 1.0f})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index b3152126a..39bb4726f 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Dual.h" #include "Magnum/Math/Quaternion.h" @@ -188,7 +188,7 @@ void DualTest::constructCopy() { constexpr Dual b(a); CORRADE_COMPARE(b, Dual(2.0f, 3.0f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/FrustumTest.cpp b/src/Magnum/Math/Test/FrustumTest.cpp index 8a3065a46..4fbf77f77 100644 --- a/src/Magnum/Math/Test/FrustumTest.cpp +++ b/src/Magnum/Math/Test/FrustumTest.cpp @@ -29,7 +29,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Frustum.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -250,7 +250,7 @@ void FrustumTest::constructCopy() { constexpr Frustum b{a}; CORRADE_COMPARE(b, a); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/HalfTest.cpp b/src/Magnum/Math/Test/HalfTest.cpp index 6e153436a..0637dfaf2 100644 --- a/src/Magnum/Math/Test/HalfTest.cpp +++ b/src/Magnum/Math/Test/HalfTest.cpp @@ -31,7 +31,7 @@ #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN) #include #endif -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Half.h" #include "Magnum/Math/Packing.h" @@ -565,7 +565,7 @@ void HalfTest::constructCopy() { CORRADE_COMPARE(b, Half{3.5f}); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp index 43440f83a..27fdc431a 100644 --- a/src/Magnum/Math/Test/Matrix3Test.cpp +++ b/src/Magnum/Math/Test/Matrix3Test.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -294,7 +294,7 @@ void Matrix3Test::constructCopy() { {4.5f, 4.0f, 7.0f}, {7.9f, -1.0f, 8.0f})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp index 0f58906fe..5d044adfb 100644 --- a/src/Magnum/Math/Test/Matrix4Test.cpp +++ b/src/Magnum/Math/Test/Matrix4Test.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Matrix4.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -354,7 +354,7 @@ void Matrix4Test::constructCopy() { {1.0f, 2.0f, 3.0f, -1.0f}, {7.9f, -1.0f, 8.0f, -1.5f})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index 766b20b91..b5e002b9a 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Matrix.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -292,12 +292,12 @@ void MatrixTest::constructCopy() { Vector4(1.0f, 2.0f, 3.0f, -1.0f), Vector4(7.9f, -1.0f, 8.0f, -1.5f))); - CORRADE_VERIFY(std::is_nothrow_copy_constructible::value); - CORRADE_VERIFY(std::is_nothrow_copy_assignable::value); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif + CORRADE_VERIFY(std::is_nothrow_copy_constructible::value); + CORRADE_VERIFY(std::is_nothrow_copy_assignable::value); } void MatrixTest::convert() { diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index 71dfbaa4a..55f4d1baf 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Functions.h" #include "Magnum/Math/Matrix4.h" @@ -300,7 +300,7 @@ void QuaternionTest::constructCopy() { constexpr Quaternion b(a); CORRADE_COMPARE(b, Quaternion({1.0f, -3.0f, 7.0f}, 2.5f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 003561ac7..c74cd8b46 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/FunctionsBatch.h" #include "Magnum/Math/Range.h" @@ -362,7 +362,7 @@ void RangeTest::constructCopy() { CORRADE_COMPARE(e, Range2Di({3, 5}, {23, 78})); CORRADE_COMPARE(f, Range3Di({3, 5, -7}, {23, 78, 2})); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_constructible::value); diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index fabe4c28f..4d4acacd0 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/RectangularMatrix.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -372,7 +372,7 @@ void RectangularMatrixTest::constructCopy() { Vector4(5.0f, 6.0f, 7.0f, 8.0f), Vector4(9.0f, 10.0f, 11.0f, 12.0f))); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp index 7263b076f..e25598cc9 100644 --- a/src/Magnum/Math/Test/UnitTest.cpp +++ b/src/Magnum/Math/Test/UnitTest.cpp @@ -25,7 +25,7 @@ #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Constants.h" #include "Magnum/Math/Unit.h" @@ -133,7 +133,7 @@ void UnitTest::constructCopy() { constexpr Sec b{a}; CORRADE_COMPARE(b, a); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp index 235c066b7..99d2f83be 100644 --- a/src/Magnum/Math/Test/Vector2Test.cpp +++ b/src/Magnum/Math/Test/Vector2Test.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Vector3.h" /* Vector3 used in Vector2Test::cross() */ #include "Magnum/Math/StrictWeakOrdering.h" @@ -172,7 +172,7 @@ void Vector2Test::constructCopy() { Vector2 b(a); CORRADE_COMPARE(b, Vector2(1.5f, 2.5f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp index 179510300..c2ab1b83b 100644 --- a/src/Magnum/Math/Test/Vector3Test.cpp +++ b/src/Magnum/Math/Test/Vector3Test.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Vector3.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -180,7 +180,7 @@ void Vector3Test::constructCopy() { Vector3 b(a); CORRADE_COMPARE(b, Vector3(1.0f, 2.5f, -3.0f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp index eaae1162a..dae87c164 100644 --- a/src/Magnum/Math/Test/Vector4Test.cpp +++ b/src/Magnum/Math/Test/Vector4Test.cpp @@ -26,7 +26,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Vector4.h" #include "Magnum/Math/StrictWeakOrdering.h" @@ -201,7 +201,7 @@ void Vector4Test::constructCopy() { Vector4 b(a); CORRADE_COMPARE(b, Vector4(1.0f, -2.5f, 3.0f, 4.1f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 03c1440ec..13559c917 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */ +#include /* CORRADE_NO_STD_IS_TRIVIALLY_TRAITS */ #include "Magnum/Math/Half.h" #include "Magnum/Math/Vector.h" @@ -297,7 +297,7 @@ void VectorTest::constructCopy() { constexpr Vector4 b(a); CORRADE_COMPARE(b, Vector4(1.0f, 3.5f, 4.0f, -2.7f)); - #ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED + #ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS CORRADE_VERIFY(std::is_trivially_copy_constructible::value); CORRADE_VERIFY(std::is_trivially_copy_assignable::value); #endif