[Bf-blender-cvs] [8697c19] master: Depsgraph: Don't use C++11 function binding with MSVC

Sergey Sharybin noreply at git.blender.org
Tue May 12 13:41:31 CEST 2015


Commit: 8697c19e91d128d91026ac043f2570583a689724
Author: Sergey Sharybin
Date:   Tue May 12 16:40:22 2015 +0500
Branches: master
https://developer.blender.org/rB8697c19e91d128d91026ac043f2570583a689724

Depsgraph: Don't use C++11 function binding with MSVC

It has some weird incompatibility with the way how Boost and GCC C++11
function bindings works, resulting in compilation errors.

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

M	source/blender/depsgraph/util/depsgraph_util_function.h

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

diff --git a/source/blender/depsgraph/util/depsgraph_util_function.h b/source/blender/depsgraph/util/depsgraph_util_function.h
index f62efd7..0f55828 100644
--- a/source/blender/depsgraph/util/depsgraph_util_function.h
+++ b/source/blender/depsgraph/util/depsgraph_util_function.h
@@ -25,7 +25,7 @@
 #ifndef __DEPSGRAPH_UTIL_FUNCTION_H__
 #define __DEPSGRAPH_UTIL_FUNCTION_H__
 
-#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
+#if (__cplusplus > 199711L)
 
 #include <functional>




More information about the Bf-blender-cvs mailing list