From 49d70377af8bf96a4407f5b76c5719e1eac0dda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Feb 2019 22:29:07 +0100 Subject: [PATCH] Test: fixed various unused function warnings. --- src/Magnum/GL/Test/AbstractShaderProgramTest.cpp | 5 +---- src/Magnum/GL/Test/TextureArrayGLTest.cpp | 2 ++ src/Magnum/Shapes/Test/CapsuleTest.cpp | 1 - src/Magnum/Shapes/Test/CylinderTest.cpp | 1 - src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp | 2 ++ 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Magnum/GL/Test/AbstractShaderProgramTest.cpp b/src/Magnum/GL/Test/AbstractShaderProgramTest.cpp index ac142662e..b296aebdb 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramTest.cpp +++ b/src/Magnum/GL/Test/AbstractShaderProgramTest.cpp @@ -54,10 +54,7 @@ void AbstractShaderProgramTest::constructNoCreate() { } void AbstractShaderProgramTest::constructCopy() { - class DummyShader: public AbstractShaderProgram { - public: - explicit DummyShader() {} - }; + class DummyShader: public AbstractShaderProgram {}; CORRADE_VERIFY(!(std::is_constructible{})); CORRADE_VERIFY(!(std::is_assignable{})); diff --git a/src/Magnum/GL/Test/TextureArrayGLTest.cpp b/src/Magnum/GL/Test/TextureArrayGLTest.cpp index 172f6ce8d..83083813e 100644 --- a/src/Magnum/GL/Test/TextureArrayGLTest.cpp +++ b/src/Magnum/GL/Test/TextureArrayGLTest.cpp @@ -82,7 +82,9 @@ struct TextureArrayGLTest: OpenGLTester { #ifndef MAGNUM_TARGET_GLES void samplingSwizzle1D(); #endif + #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) void samplingSwizzle2D(); + #endif #ifndef MAGNUM_TARGET_GLES void samplingBorderInteger1D(); diff --git a/src/Magnum/Shapes/Test/CapsuleTest.cpp b/src/Magnum/Shapes/Test/CapsuleTest.cpp index e1acad0ce..b873bf597 100644 --- a/src/Magnum/Shapes/Test/CapsuleTest.cpp +++ b/src/Magnum/Shapes/Test/CapsuleTest.cpp @@ -40,7 +40,6 @@ struct CapsuleTest: TestSuite::Tester { explicit CapsuleTest(); void transformed(); - void transformedAverageScaling(); void collisionPoint(); void collisionSphere(); }; diff --git a/src/Magnum/Shapes/Test/CylinderTest.cpp b/src/Magnum/Shapes/Test/CylinderTest.cpp index 3910f342d..1c15046b4 100644 --- a/src/Magnum/Shapes/Test/CylinderTest.cpp +++ b/src/Magnum/Shapes/Test/CylinderTest.cpp @@ -40,7 +40,6 @@ struct CylinderTest: TestSuite::Tester { explicit CylinderTest(); void transformed(); - void transformedAverageScaling(); void collisionPoint(); void collisionSphere(); }; diff --git a/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp b/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp index 73120794f..79a821a1a 100644 --- a/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp +++ b/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp @@ -54,7 +54,9 @@ struct DistanceFieldGLTest: GL::OpenGLTester { explicit DistanceFieldGLTest(); void test(); + #ifndef MAGNUM_TARGET_WEBGL void benchmark(); + #endif private: PluginManager::Manager _manager;