Browse Source

Trade: suppress useless deprecation warnings on GCC 4.8.

Warning that a *deprecated class* copy/move constructor/assignment is
deprecated is useless. Good thing the newer versions fixed that,
nevertheless it's still beyond annoying to see in the CI output.
pull/539/head
Vladimír Vondruš 4 years ago
parent
commit
c9dfd0854c
  1. 8
      src/Magnum/Trade/MeshData2D.h
  2. 8
      src/Magnum/Trade/MeshData3D.h
  3. 8
      src/Magnum/Trade/ObjectData2D.h
  4. 8
      src/Magnum/Trade/ObjectData3D.h

8
src/Magnum/Trade/MeshData2D.h

@ -90,9 +90,12 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D
#endif #endif
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData2D(const MeshData2D&) = delete; MeshData2D(const MeshData2D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move constructor */ /** @brief Move constructor */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData2D(MeshData2D&&) MeshData2D(MeshData2D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -101,13 +104,17 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
~MeshData2D(); ~MeshData2D();
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData2D& operator=(const MeshData2D&) = delete; MeshData2D& operator=(const MeshData2D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move assignment */ /** @brief Move assignment */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData2D& operator=(MeshData2D&&) MeshData2D& operator=(MeshData2D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -116,6 +123,7 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Primitive */ /** @brief Primitive */
MeshPrimitive primitive() const { return _primitive; } MeshPrimitive primitive() const { return _primitive; }

8
src/Magnum/Trade/MeshData3D.h

@ -91,9 +91,12 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D
#endif #endif
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData3D(const MeshData3D&) = delete; MeshData3D(const MeshData3D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move constructor */ /** @brief Move constructor */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData3D(MeshData3D&&) MeshData3D(MeshData3D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -102,13 +105,17 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
~MeshData3D(); ~MeshData3D();
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData3D& operator=(const MeshData3D&) = delete; MeshData3D& operator=(const MeshData3D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move assignment */ /** @brief Move assignment */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
MeshData3D& operator=(MeshData3D&&) MeshData3D& operator=(MeshData3D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -117,6 +124,7 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Primitive */ /** @brief Primitive */
MeshPrimitive primitive() const { return _primitive; } MeshPrimitive primitive() const { return _primitive; }

8
src/Magnum/Trade/ObjectData2D.h

@ -153,9 +153,12 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
explicit ObjectData2D(std::vector<UnsignedInt> children, const Vector2& translation, const Complex& rotation, const Vector2& scaling, const void* importerState = nullptr); explicit ObjectData2D(std::vector<UnsignedInt> children, const Vector2& translation, const Complex& rotation, const Vector2& scaling, const void* importerState = nullptr);
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData2D(const ObjectData2D&) = delete; ObjectData2D(const ObjectData2D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move constructor */ /** @brief Move constructor */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData2D(ObjectData2D&&) ObjectData2D(ObjectData2D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -164,14 +167,18 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Destructor */ /** @brief Destructor */
virtual ~ObjectData2D(); virtual ~ObjectData2D();
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData2D& operator=(const ObjectData2D&) = delete; ObjectData2D& operator=(const ObjectData2D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move assignment */ /** @brief Move assignment */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData2D& operator=(ObjectData2D&&) ObjectData2D& operator=(ObjectData2D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -180,6 +187,7 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Child objects */ /** @brief Child objects */
std::vector<UnsignedInt>& children() { return _children; } std::vector<UnsignedInt>& children() { return _children; }

8
src/Magnum/Trade/ObjectData3D.h

@ -154,9 +154,12 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
explicit ObjectData3D(std::vector<UnsignedInt> children, const Vector3& translation, const Quaternion& rotation, const Vector3& scaling, const void* importerState = nullptr); explicit ObjectData3D(std::vector<UnsignedInt> children, const Vector3& translation, const Quaternion& rotation, const Vector3& scaling, const void* importerState = nullptr);
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData3D(const ObjectData3D&) = delete; ObjectData3D(const ObjectData3D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move constructor */ /** @brief Move constructor */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData3D(ObjectData3D&&) ObjectData3D(ObjectData3D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -165,14 +168,18 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Destructor */ /** @brief Destructor */
virtual ~ObjectData3D(); virtual ~ObjectData3D();
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData3D& operator=(const ObjectData3D&) = delete; ObjectData3D& operator=(const ObjectData3D&) = delete;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Move assignment */ /** @brief Move assignment */
CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */
ObjectData3D& operator=(ObjectData3D&&) ObjectData3D& operator=(ObjectData3D&&)
/* GCC 4.9.0 (the one from Android NDK) thinks this does not match /* GCC 4.9.0 (the one from Android NDK) thinks this does not match
the implicit signature so it can't be defaulted. Works on 4.8, the implicit signature so it can't be defaulted. Works on 4.8,
@ -181,6 +188,7 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData
noexcept noexcept
#endif #endif
; ;
CORRADE_IGNORE_DEPRECATED_POP
/** @brief Child objects */ /** @brief Child objects */
std::vector<UnsignedInt>& children() { return _children; } std::vector<UnsignedInt>& children() { return _children; }

Loading…
Cancel
Save