Merge commit 'f8dd96543542220181c76afb8c084f4908213fb5' as 'third_party/mason'
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
--- libs/python/src/converter/builtin_converters.cpp 2012-12-07 11:51:06.000000000 -0800
|
||||
+++ libs/python/src/converter/builtin_converters.cpp 2014-04-01 17:24:37.000000000 -0700
|
||||
@@ -32,7 +32,9 @@
|
||||
|
||||
void shared_ptr_deleter::operator()(void const*)
|
||||
{
|
||||
+ PyGILState_STATE gil = PyGILState_Ensure();
|
||||
owner.reset();
|
||||
+ PyGILState_Release(gil);
|
||||
}
|
||||
|
||||
namespace
|
||||
Reference in New Issue
Block a user