diff --git a/src/Magnum/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h index 4d84a592f..fa43a4876 100644 --- a/src/Magnum/Trade/MeshData2D.h +++ b/src/Magnum/Trade/MeshData2D.h @@ -90,9 +90,12 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D #endif /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData2D(const MeshData2D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move constructor */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData2D(MeshData2D&&) /* 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, @@ -101,13 +104,17 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP ~MeshData2D(); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData2D& operator=(const MeshData2D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move assignment */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData2D& operator=(MeshData2D&&) /* 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, @@ -116,6 +123,7 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData2D noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Primitive */ MeshPrimitive primitive() const { return _primitive; } diff --git a/src/Magnum/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h index 6711e5ace..054005f20 100644 --- a/src/Magnum/Trade/MeshData3D.h +++ b/src/Magnum/Trade/MeshData3D.h @@ -91,9 +91,12 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D #endif /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData3D(const MeshData3D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move constructor */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData3D(MeshData3D&&) /* 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, @@ -102,13 +105,17 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP ~MeshData3D(); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData3D& operator=(const MeshData3D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move assignment */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ MeshData3D& operator=(MeshData3D&&) /* 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, @@ -117,6 +124,7 @@ class CORRADE_DEPRECATED("use MeshData instead") MAGNUM_TRADE_EXPORT MeshData3D noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Primitive */ MeshPrimitive primitive() const { return _primitive; } diff --git a/src/Magnum/Trade/ObjectData2D.h b/src/Magnum/Trade/ObjectData2D.h index 8f50c129d..30aefda8e 100644 --- a/src/Magnum/Trade/ObjectData2D.h +++ b/src/Magnum/Trade/ObjectData2D.h @@ -153,9 +153,12 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData explicit ObjectData2D(std::vector children, const Vector2& translation, const Complex& rotation, const Vector2& scaling, const void* importerState = nullptr); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData2D(const ObjectData2D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move constructor */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData2D(ObjectData2D&&) /* 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, @@ -164,14 +167,18 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Destructor */ virtual ~ObjectData2D(); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData2D& operator=(const ObjectData2D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move assignment */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData2D& operator=(ObjectData2D&&) /* 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, @@ -180,6 +187,7 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Child objects */ std::vector& children() { return _children; } diff --git a/src/Magnum/Trade/ObjectData3D.h b/src/Magnum/Trade/ObjectData3D.h index f96ab2965..328e473a0 100644 --- a/src/Magnum/Trade/ObjectData3D.h +++ b/src/Magnum/Trade/ObjectData3D.h @@ -154,9 +154,12 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData explicit ObjectData3D(std::vector children, const Vector3& translation, const Quaternion& rotation, const Vector3& scaling, const void* importerState = nullptr); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData3D(const ObjectData3D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move constructor */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData3D(ObjectData3D&&) /* 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, @@ -165,14 +168,18 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Destructor */ virtual ~ObjectData3D(); /** @brief Copying is not allowed */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData3D& operator=(const ObjectData3D&) = delete; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Move assignment */ + CORRADE_IGNORE_DEPRECATED_PUSH /* GCC 4.8 warns due to the argument */ ObjectData3D& operator=(ObjectData3D&&) /* 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, @@ -181,6 +188,7 @@ class CORRADE_DEPRECATED("use SceneData instead") MAGNUM_TRADE_EXPORT ObjectData noexcept #endif ; + CORRADE_IGNORE_DEPRECATED_POP /** @brief Child objects */ std::vector& children() { return _children; }