diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2009-03-18 23:54:09 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2009-03-18 23:54:09 +0000 |
| commit | 51a723aa85c91b36dff1240ca58e9790f1bf260a (patch) | |
| tree | f52932bd0e684bb1dd6b7e120610ea9ed5e7884d | |
| parent | 6975ecd65c52543bd630730e62a30f42a1ad1bb6 (diff) | |
| download | swig-51a723aa85c91b36dff1240ca58e9790f1bf260a.tar.gz | |
Add possibility of using when using shared_ptr and wrapping pointers
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11157 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | Lib/python/boost_shared_ptr.i | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Lib/python/boost_shared_ptr.i b/Lib/python/boost_shared_ptr.i index 2e34290ac..6b43ca685 100644 --- a/Lib/python/boost_shared_ptr.i +++ b/Lib/python/boost_shared_ptr.i @@ -1,5 +1,11 @@ %include <shared_ptr.i> +// Set SHARED_PTR_DISOWN to $disown if required, for example +// #define SHARED_PTR_DISOWN $disown +#if !defined(SHARED_PTR_DISOWN) +#define SHARED_PTR_DISOWN 0 +#endif + %define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %naturalvar TYPE; @@ -51,10 +57,11 @@ } // plain pointer -// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); +/*overhere*/ + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } @@ -139,10 +146,10 @@ } // plain pointer by reference -// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance %typemap(in) CONST TYPE *& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { int newmem = 0; - res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); if (!SWIG_IsOK(res)) { %argument_fail(res, "$type", $symname, $argnum); } |