Browse Source

Adapt to Corrade changes.

pull/168/head
Vladimír Vondruš 3 years ago
parent
commit
59bb7b8cd5
  1. 4
      src/Magnum/Math/Test/AngleTest.cpp
  2. 4
      src/Magnum/Math/Test/BezierTest.cpp
  3. 4
      src/Magnum/Math/Test/BitVectorTest.cpp
  4. 4
      src/Magnum/Math/Test/ColorTest.cpp
  5. 4
      src/Magnum/Math/Test/ComplexTest.cpp
  6. 10
      src/Magnum/Math/Test/CubicHermiteTest.cpp
  7. 4
      src/Magnum/Math/Test/DualComplexTest.cpp
  8. 4
      src/Magnum/Math/Test/DualQuaternionTest.cpp
  9. 4
      src/Magnum/Math/Test/DualTest.cpp
  10. 4
      src/Magnum/Math/Test/FrustumTest.cpp
  11. 4
      src/Magnum/Math/Test/HalfTest.cpp
  12. 4
      src/Magnum/Math/Test/Matrix3Test.cpp
  13. 4
      src/Magnum/Math/Test/Matrix4Test.cpp
  14. 8
      src/Magnum/Math/Test/MatrixTest.cpp
  15. 4
      src/Magnum/Math/Test/QuaternionTest.cpp
  16. 4
      src/Magnum/Math/Test/RangeTest.cpp
  17. 4
      src/Magnum/Math/Test/RectangularMatrixTest.cpp
  18. 4
      src/Magnum/Math/Test/UnitTest.cpp
  19. 4
      src/Magnum/Math/Test/Vector2Test.cpp
  20. 4
      src/Magnum/Math/Test/Vector3Test.cpp
  21. 4
      src/Magnum/Math/Test/Vector4Test.cpp
  22. 4
      src/Magnum/Math/Test/VectorTest.cpp

4
src/Magnum/Math/Test/AngleTest.cpp

@ -34,7 +34,7 @@
#include <Corrade/Utility/FormatStl.h>
#include <Corrade/Utility/TweakableParser.h>
#endif
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Deg>::value);
CORRADE_VERIFY(std::is_trivially_copy_constructible<Rad>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Deg>::value);

4
src/Magnum/Math/Test/BezierTest.cpp

@ -27,7 +27,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<QuadraticBezier2D>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<QuadraticBezier2D>::value);
#endif

4
src/Magnum/Math/Test/BitVectorTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<BitVector19>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<BitVector19>::value);
#endif

4
src/Magnum/Math/Test/ColorTest.cpp

@ -32,7 +32,7 @@
#include <Corrade/Utility/FormatStl.h>
#include <Corrade/Utility/Tweakable.h>
#endif
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Color3>::value);
CORRADE_VERIFY(std::is_trivially_copy_constructible<Color4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Color3>::value);

4
src/Magnum/Math/Test/ComplexTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Complex>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Complex>::value);
#endif

10
src/Magnum/Math/Test/CubicHermiteTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<CubicHermite1D>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<CubicHermite1D>::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<CubicHermite2D>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<CubicHermite2D>::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<CubicHermiteComplex>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<CubicHermiteComplex>::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<CubicHermiteQuaternion>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<CubicHermiteQuaternion>::value);
#endif

4
src/Magnum/Math/Test/DualComplexTest.cpp

@ -27,7 +27,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<DualComplex>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<DualComplex>::value);
#endif

4
src/Magnum/Math/Test/DualQuaternionTest.cpp

@ -27,7 +27,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<DualQuaternion>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<DualQuaternion>::value);
#endif

4
src/Magnum/Math/Test/DualTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Dual>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Dual>::value);
#endif

4
src/Magnum/Math/Test/FrustumTest.cpp

@ -29,7 +29,7 @@
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Frustum>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Frustum>::value);
#endif

4
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 <Corrade/Utility/Tweakable.h>
#endif
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Half>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Half>::value);
#endif

4
src/Magnum/Math/Test/Matrix3Test.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Matrix3>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Matrix3>::value);
#endif

4
src/Magnum/Math/Test/Matrix4Test.cpp

@ -27,7 +27,7 @@
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Numeric.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Matrix4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Matrix4>::value);
#endif

8
src/Magnum/Math/Test/MatrixTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Matrix4x4>::value);
CORRADE_VERIFY(std::is_nothrow_copy_assignable<Matrix4x4>::value);
#ifdef CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED
#ifndef CORRADE_NO_STD_IS_TRIVIALLY_TRAITS
CORRADE_VERIFY(std::is_trivially_copy_constructible<Matrix4x4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Matrix4x4>::value);
#endif
CORRADE_VERIFY(std::is_nothrow_copy_constructible<Matrix4x4>::value);
CORRADE_VERIFY(std::is_nothrow_copy_assignable<Matrix4x4>::value);
}
void MatrixTest::convert() {

4
src/Magnum/Math/Test/QuaternionTest.cpp

@ -27,7 +27,7 @@
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Numeric.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Quaternion>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Quaternion>::value);
#endif

4
src/Magnum/Math/Test/RangeTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Range1Di>::value);
CORRADE_VERIFY(std::is_trivially_copy_constructible<Range2Di>::value);
CORRADE_VERIFY(std::is_trivially_copy_constructible<Range3Di>::value);

4
src/Magnum/Math/Test/RectangularMatrixTest.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Matrix3x4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Matrix3x4>::value);
#endif

4
src/Magnum/Math/Test/UnitTest.cpp

@ -25,7 +25,7 @@
#include <new>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Sec>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Sec>::value);
#endif

4
src/Magnum/Math/Test/Vector2Test.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Vector2>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Vector2>::value);
#endif

4
src/Magnum/Math/Test/Vector3Test.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Vector3>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Vector3>::value);
#endif

4
src/Magnum/Math/Test/Vector4Test.cpp

@ -26,7 +26,7 @@
#include <sstream>
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Vector4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Vector4>::value);
#endif

4
src/Magnum/Math/Test/VectorTest.cpp

@ -27,7 +27,7 @@
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Numeric.h>
#include <Corrade/Utility/DebugStl.h>
#include <Corrade/Utility/TypeTraits.h> /* CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED */
#include <Corrade/Utility/TypeTraits.h> /* 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<Vector4>::value);
CORRADE_VERIFY(std::is_trivially_copy_assignable<Vector4>::value);
#endif

Loading…
Cancel
Save