From 8408dc9e4dbb0302d523e893861b60473a33c91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 12 Feb 2015 13:03:40 -0800 Subject: [PATCH] use a reinterpret_cast to return the correct type --- include/mbgl/platform/log.hpp | 2 +- src/mbgl/shader/shader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mbgl/platform/log.hpp b/include/mbgl/platform/log.hpp index b95895fd1..8b58921bb 100644 --- a/include/mbgl/platform/log.hpp +++ b/include/mbgl/platform/log.hpp @@ -61,7 +61,7 @@ public: template static inline const T &Set(Args&& ...args) { Backend = util::make_unique(::std::forward(args)...); - return *dynamic_cast(Backend.get()); + return *reinterpret_cast(Backend.get()); } private: diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp index 00b928b44..a079409aa 100644 --- a/src/mbgl/shader/shader.cpp +++ b/src/mbgl/shader/shader.cpp @@ -127,7 +127,7 @@ bool Shader::compileShader(GLuint *shader, GLenum type, const GLchar *source) { MBGL_CHECK_ERROR(glGetShaderiv(*shader, GL_COMPILE_STATUS, &status)); if (status == GL_FALSE) { - Log::Error(Event::Shader, "Shader %s failed to compile.", name, type); + Log::Error(Event::Shader, "Shader %s failed to compile.", name); MBGL_CHECK_ERROR(glDeleteShader(*shader)); *shader = 0; return false;