[Bf-blender-cvs] [d3388f0] master: Fix compilation error in Win Debug.

[Benoit Bolsee]

Commit: d3388f0c7aa1e51821c9d0fcab92fb513aaff6cf
Author: Benoit Bolsee
Date:   Mon Apr 6 23:15:57 2015 +0200
Branches: master
https://developer.blender.org/rBd3388f0c7aa1e51821c9d0fcab92fb513aaff6cf

Fix compilation error in Win Debug.

===================================================================

M       intern/ghost/intern/GHOST_ContextWGL.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp 
b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 979dc54..4f4cab7 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -120,9 +120,9 @@ GHOST_ContextWGL::~GHOST_ContextWGL()
 #endif
 
 #ifndef NDEBUG
-       free(m_dummyRenderer);
-       free(m_dummyVendor);
-       free(m_dummyVersion);
+       free((void*)m_dummyRenderer);
+       free((void*)m_dummyVendor);
+       free((void*)m_dummyVersion);
 #endif
 }
 
@@ -393,9 +393,9 @@ void 
GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD)
        // the following are not technially WGLEW, but they also require a 
context to work
 
 #ifndef NDEBUG
-       free(m_dummyRenderer);
-       free(m_dummyVendor);
-       free(m_dummyVersion);
+       free((void*)m_dummyRenderer);
+       free((void*)m_dummyVendor);
+       free((void*)m_dummyVersion);
 
        m_dummyRenderer = _strdup(reinterpret_cast<const char 
*>(glGetString(GL_RENDERER)));
        m_dummyVendor   = _strdup(reinterpret_cast<const char 
*>(glGetString(GL_VENDOR)));

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs