From e35b82ba9bf76a821c82d46a61bcc3715a81dd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Jul 2013 11:48:07 +0200 Subject: [PATCH 1/2] Platform: forgot this. Also the message in 883600e373854eef0a5c0ee8f2d1f0c52a0c3c8c should say "Make Configuration constructors _implicit_". Damn. --- src/Platform/WindowlessNaClApplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Platform/WindowlessNaClApplication.h b/src/Platform/WindowlessNaClApplication.h index 1fe6e6b81..5b15d5c0f 100644 --- a/src/Platform/WindowlessNaClApplication.h +++ b/src/Platform/WindowlessNaClApplication.h @@ -145,7 +145,7 @@ class WindowlessNaClApplication::Configuration { Configuration& operator=(Configuration&&) = delete; public: - constexpr explicit Configuration() {} + constexpr /*implicit*/ Configuration() {} }; namespace Implementation { From 771968c69a8a34dac508895a01a3aac01e92fcf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Jul 2013 11:50:33 +0200 Subject: [PATCH 2/2] Shaders: forgot this. Follow up to 2eb4e3c8ba98630b54e98090a08d8ba69253c351. Damn. --- src/Shaders/VertexColor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shaders/VertexColor.cpp b/src/Shaders/VertexColor.cpp index 205b3e66d..9f9268006 100644 --- a/src/Shaders/VertexColor.cpp +++ b/src/Shaders/VertexColor.cpp @@ -80,7 +80,7 @@ template VertexColor::VertexColor(): transfo /* Set defaults in OpenGL ES (for desktop they are set in shader code itself) */ #ifdef MAGNUM_TARGET_GLES - setTransformationProjectionMatrix(typename DimensionTraits::MatrixType()); + setTransformationProjectionMatrix(typename DimensionTraits::MatrixType()); #endif }