[Bf-blender-cvs] [728bb4d] soc-2014-viewport_fx: Fix for MSVC where __func__ is not defined unless you accidentally include BLI_compiler_compat.h

Jason Wilkins noreply at git.blender.org
Wed Jun 25 23:42:46 CEST 2014


Commit: 728bb4d239d63cd80da5a8b99b10a5274dadbddd
Author: Jason Wilkins
Date:   Wed Jun 25 16:13:52 2014 -0500
https://developer.blender.org/rB728bb4d239d63cd80da5a8b99b10a5274dadbddd

Fix for MSVC where __func__ is not defined unless you accidentally include BLI_compiler_compat.h

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

M	intern/guardedalloc/MEM_guardedalloc.h

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

diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 4fb6896..17e6b6c 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -66,6 +66,14 @@
 #include "../../source/blender/blenlib/BLI_sys_types.h"
 #include "../../source/blender/blenlib/BLI_compiler_attrs.h"
 
+
+
+#if defined(_MSC_VER) && !defined(__func__)
+#  define __func__ __FUNCTION__
+#endif
+
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif




More information about the Bf-blender-cvs mailing list