diff --git a/src/Magnum/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h index 20691458b..d0ef19fac 100644 --- a/src/Magnum/SceneGraph/AbstractTranslation.h +++ b/src/Magnum/SceneGraph/AbstractTranslation.h @@ -85,6 +85,9 @@ class AbstractTranslation: public AbstractTransformation { #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -95,6 +98,8 @@ class AbstractTranslation: public AbstractTransformation { } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h index 8e97331cc..4af4e6a62 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h @@ -73,6 +73,9 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -83,6 +86,8 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -104,16 +109,18 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation2D& translate(const Math::Vector2& vector, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslation2D::translate(vector, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif #endif diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h index c2ceff9b8..30c6f7984 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h @@ -77,6 +77,9 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -87,6 +90,8 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -122,6 +127,9 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateX() @@ -132,6 +140,8 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -167,6 +177,9 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateY() @@ -177,6 +190,8 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -212,6 +227,9 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateZ() @@ -222,6 +240,8 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -243,16 +263,18 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D& translate(const Math::Vector3& vector, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslation3D::translate(vector, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif #endif diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h index ff5f27901..99cb9a2a9 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h @@ -73,6 +73,9 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief scale() @@ -83,6 +86,8 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -104,16 +109,18 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling2D& translate(const Math::Vector2& vector, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation2D::translate(vector, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif AbstractBasicTranslationRotationScaling2D& rotate(Math::Rad angle) { @@ -128,16 +135,18 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling2D& rotate(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation2D::rotate(angle, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif #endif diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h index 492a9c54d..e93bc5735 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h @@ -73,19 +73,21 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief scale() * @deprecated Use @ref scale() or @ref scaleLocal() instead. */ CORRADE_DEPRECATED("use scale() or scaleLocal() instead") AbstractBasicTranslationRotationScaling3D& scale(const Math::Vector3& vector, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif return type == TransformationType::Global ? scale(vector) : scaleLocal(vector); } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -107,16 +109,18 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling3D& translate(const Math::Vector3& vector, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation3D::translate(vector, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif AbstractBasicTranslationRotationScaling3D& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis) { @@ -131,16 +135,18 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling3D& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation3D::rotate(angle, normalizedAxis, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif AbstractBasicTranslationRotationScaling3D& rotateX(Math::Rad angle) { @@ -155,16 +161,18 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateX(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation3D::rotateX(angle, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif AbstractBasicTranslationRotationScaling3D& rotateY(Math::Rad angle) { @@ -179,16 +187,18 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateY(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation3D::rotateY(angle, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif AbstractBasicTranslationRotationScaling3D& rotateZ(Math::Rad angle) { @@ -203,16 +213,18 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateZ(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif AbstractBasicTranslationRotation3D::rotateZ(angle, type); return *this; } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif #endif diff --git a/src/Magnum/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h index a0e1ca2b8..b4eab8651 100644 --- a/src/Magnum/SceneGraph/DualComplexTransformation.h +++ b/src/Magnum/SceneGraph/DualComplexTransformation.h @@ -113,6 +113,9 @@ template class BasicDualComplexTransformation: public AbstractBasicTran #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -123,6 +126,8 @@ template class BasicDualComplexTransformation: public AbstractBasicTran } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -153,6 +158,9 @@ template class BasicDualComplexTransformation: public AbstractBasicTran #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -163,6 +171,8 @@ template class BasicDualComplexTransformation: public AbstractBasicTran } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -192,6 +202,9 @@ template class BasicDualComplexTransformation: public AbstractBasicTran #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -202,6 +215,8 @@ template class BasicDualComplexTransformation: public AbstractBasicTran } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h index e5dd5905f..a4d292e48 100644 --- a/src/Magnum/SceneGraph/DualQuaternionTransformation.h +++ b/src/Magnum/SceneGraph/DualQuaternionTransformation.h @@ -113,6 +113,9 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -123,6 +126,8 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -152,6 +157,9 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -162,6 +170,8 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -194,6 +204,9 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -204,6 +217,8 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -219,15 +234,17 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") Object>& rotateX(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif return rotate(angle, Math::Vector3::xAxis(), type); } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif Object>& rotateY(Math::Rad angle) { @@ -240,15 +257,17 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") Object>& rotateY(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif return rotate(angle, Math::Vector3::yAxis(), type); } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif Object>& rotateZ(Math::Rad angle) { @@ -261,15 +280,17 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") Object>& rotateZ(Math::Rad angle, TransformationType type) { - #ifdef _MSC_VER - #pragma warning(suppress: 4996) - #endif return rotate(angle, Math::Vector3::zAxis(), type); } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif #endif diff --git a/src/Magnum/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h index b3d70cf27..337b9ce8a 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation2D.h @@ -90,6 +90,9 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -100,6 +103,8 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -135,6 +140,9 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -145,6 +153,8 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -175,6 +185,9 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -185,6 +198,8 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -215,6 +230,9 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief scale() @@ -225,6 +243,8 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -257,6 +277,9 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief reflect() @@ -267,6 +290,8 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h index c526ba860..afa2efd7f 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation3D.h @@ -95,6 +95,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -105,6 +108,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -135,6 +140,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -145,6 +153,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -178,6 +188,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -188,6 +201,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -218,6 +233,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateX() @@ -228,6 +246,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -258,6 +278,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateY() @@ -268,6 +291,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -298,6 +323,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateZ() @@ -308,6 +336,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -338,6 +368,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief scale() @@ -348,6 +381,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -379,6 +414,9 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief reflect() @@ -389,6 +427,8 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h index ce660ba5b..0d904e725 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h @@ -118,6 +118,9 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -128,6 +131,8 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -158,6 +163,9 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -168,6 +176,8 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -199,6 +209,9 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -209,6 +222,8 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -240,6 +255,9 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief reflect() @@ -250,6 +268,8 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h index fe87a8d36..d100ba987 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h @@ -117,6 +117,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief transform() @@ -127,6 +130,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -157,6 +162,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief translate() @@ -167,6 +175,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -201,6 +211,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotate() @@ -211,6 +224,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -241,6 +256,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateX() @@ -251,6 +269,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -281,6 +301,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateY() @@ -291,6 +314,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -321,6 +346,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief rotateZ() @@ -331,6 +359,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif @@ -362,6 +392,9 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #elif defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable: 4996) #endif /** * @copybrief reflect() @@ -372,6 +405,8 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr } #ifdef __GNUC__ #pragma GCC diagnostic pop + #elif defined(_MSC_VER) + #pragma warning(pop) #endif #endif diff --git a/src/Magnum/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h index 93a025815..00d59b994 100644 --- a/src/Magnum/SceneGraph/TranslationTransformation.h +++ b/src/Magnum/SceneGraph/TranslationTransformation.h @@ -98,6 +98,9 @@ class TranslationTransformation: public AbstractTranslation