Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2015-04-07 00:15:57 +0300
committerBenoit Bolsee <benoit.bolsee@online.be>2015-04-07 00:17:18 +0300
commitd3388f0c7aa1e51821c9d0fcab92fb513aaff6cf (patch)
tree08064291479ae0fc0c70d29ba9f114e71e1a623e /intern/ghost
parentbcc9a235487e9607204475ce66140d4cef3d59bf (diff)
Fix compilation error in Win Debug.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_ContextWGL.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 979dc549498..4f4cab77602 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)));