[Bf-blender-cvs] [bfaebea] master: Fix T46799: Blender crashes when enumerating POCL devices

Sergey Sharybin noreply at git.blender.org
Fri Nov 27 10:56:33 CET 2015


Commit: bfaebeaee64399e4c6da65b8aaa63e1a3cc3d000
Author: Sergey Sharybin
Date:   Fri Nov 27 14:48:26 2015 +0500
Branches: master
https://developer.blender.org/rBbfaebeaee64399e4c6da65b8aaa63e1a3cc3d000

Fix T46799: Blender crashes when enumerating POCL devices

The issue was caused by a conflict between std::error_code linked into
Blender which is compiled without C++11 support and POCL's expectations
of std::error_code which was actually linked against C++11's STL.

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

M	source/creator/blender.map

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

diff --git a/source/creator/blender.map b/source/creator/blender.map
index 359cbe0..9c900a6 100644
--- a/source/creator/blender.map
+++ b/source/creator/blender.map
@@ -9,6 +9,7 @@ global:
 	*;
 	*_boost*;
 local:
+	*default_error_condition*;
 	*llvm*;
 	*LLVM*;
 	decodeInstruction;




More information about the Bf-blender-cvs mailing list