Merge branch 'master' into compatibility

13 years ago · 78b650400c
2 changed files with 2 additions and 2 deletions
--- a/src/Platform/WindowlessNaClApplication.h
+++ b/src/Platform/WindowlessNaClApplication.h
@ -149,7 +149,7 @@ class WindowlessNaClApplication::Configuration {
    Configuration& operator=(Configuration&&) = delete;

    public:
-        constexpr explicit Configuration() {}
+        constexpr /*implicit*/ Configuration() {}
 };

 namespace Implementation {
--- a/src/Shaders/VertexColor.cpp
+++ b/src/Shaders/VertexColor.cpp
@ -91,7 +91,7 @@ template<UnsignedInt dimensions> VertexColor<dimensions>::VertexColor(): transfo

    /* Set defaults in OpenGL ES (for desktop they are set in shader code itself) */
    #ifdef MAGNUM_TARGET_GLES
-    setTransformationProjectionMatrix(typename DimensionTraits<dimensions>::MatrixType());
+    setTransformationProjectionMatrix(typename DimensionTraits<dimensions, Float>::MatrixType());
    #endif
 }