jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shared_ptr improvements so the proxy class does not need to be specified - SWIG_SHARED_PTR macro deprecated and replaced by %shared_ptr

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12037 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2010-05-22 23:57:19 +00:00
commit 3dfac02269
11 changed files with 117 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CHANGES.current
View file

@ -1,11 +1,20 @@
Version 2.0.0 (in progress) Version 2.0.0 (in progress)
============================ ============================
2010-05-22: wsfulton 2010-05-23: wsfulton
Fix #2408232. Improve shared_ptr and intrusive_ptr wrappers for classes in an Fix #2408232. Improve shared_ptr and intrusive_ptr wrappers for classes in an
inheritance hierarchy. No special treatment is needed for derived classes, the inheritance hierarchy. No special treatment is needed for derived classes.
SWIG_SHARED_PTR_DERIVED macro is deprecated and SWIG_SHARED_PTR should be used The proxy class also no longer needs to be specified, it is automatically
instead. deduced. The following macros are deprecated:
SWIG_SHARED_PTR(PROXYCLASS, TYPE)
SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE)
and have been replaced by
%shared_ptr(TYPE)
Similarly for intrusive_ptr wrappers, the following macro is deprecated:
SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE)
SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE)
and have been replaced by
%intrusive_ptr(TYPE)
2010-05-21: olly 2010-05-21: olly
[PHP] Stop generating a bogus line of code in certain constructors. [PHP] Stop generating a bogus line of code in certain constructors.

12
Examples/test-suite/li_boost_intrusive_ptr.i
View file

@ -44,10 +44,10 @@
#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) #if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED)
%include <boost_intrusive_ptr.i> %include <boost_intrusive_ptr.i>
SWIG_INTRUSIVE_PTR(Klass, Space::Klass) %intrusive_ptr(Space::Klass)
SWIG_INTRUSIVE_PTR_NO_WRAP(KlassWithoutRefCount, Space::KlassWithoutRefCount) %intrusive_ptr_no_wrap(Space::KlassWithoutRefCount)
SWIG_INTRUSIVE_PTR(KlassDerived, Space::KlassDerived) %intrusive_ptr(Space::KlassDerived)
SWIG_INTRUSIVE_PTR(KlassDerivedDerived, Space::KlassDerivedDerived) %intrusive_ptr(Space::KlassDerivedDerived)
//For the use_count shared_ptr functions //For the use_count shared_ptr functions
%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{ %typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{
@ -389,8 +389,8 @@ Space::Klass & GlobalReference = GlobalValue;
#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) #if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED)
// Note: %template after the intrusive_ptr typemaps // Note: %template after the intrusive_ptr typemaps
SWIG_INTRUSIVE_PTR(BaseIntDouble, Base<int, double>) %intrusive_ptr(Base<int, double>)
SWIG_INTRUSIVE_PTR(PairIntDouble, Pair<int, double>) %intrusive_ptr(Pair<int, double>)
#endif #endif

12
Examples/test-suite/li_boost_shared_ptr.i
View file

@ -41,10 +41,10 @@
#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) #if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED)
%include <boost_shared_ptr.i> %include <boost_shared_ptr.i>
SWIG_SHARED_PTR(Klass, Space::Klass) %shared_ptr(Space::Klass)
SWIG_SHARED_PTR(KlassDerived, Space::KlassDerived) %shared_ptr(Space::KlassDerived)
SWIG_SHARED_PTR(Klass2ndDerived, Space::Klass2ndDerived) %shared_ptr(Space::Klass2ndDerived)
SWIG_SHARED_PTR(Klass3rdDerived, Space::Klass3rdDerived) %shared_ptr(Space::Klass3rdDerived)
#endif #endif
@ -317,8 +317,8 @@ Space::Klass & GlobalReference = GlobalValue;
#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) #if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED)
// Note: %template after the shared_ptr typemaps // Note: %template after the shared_ptr typemaps
SWIG_SHARED_PTR(BaseIntDouble, Base<int, double>) %shared_ptr(Base<int, double>)
SWIG_SHARED_PTR(PairIntDouble, Pair<int, double>) %shared_ptr(Pair<int, double>)
#endif #endif

2
Examples/test-suite/li_boost_shared_ptr_bits.i
View file

@ -7,7 +7,7 @@
#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) #if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED)
%include <boost_shared_ptr.i> %include <boost_shared_ptr.i>
SWIG_SHARED_PTR(NonDynamic, NonDynamic) %shared_ptr(NonDynamic)
#endif #endif

27
Lib/csharp/boost_shared_ptr.i
View file

@ -1,7 +1,7 @@
%include <shared_ptr.i> %include <shared_ptr.i>
// Language specific macro implementing all the customisations for handling the smart pointer // Language specific macro implementing all the customisations for handling the smart pointer
%define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
// %naturalvar is as documented for member variables // %naturalvar is as documented for member variables
%naturalvar TYPE; %naturalvar TYPE;
@ -96,51 +96,51 @@
%typemap (cstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, %typemap (cstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "PROXYCLASS" SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(cstype, TYPE)"
%typemap(csin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, %typemap(csin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "PROXYCLASS.getCPtr($csinput)" SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(cstype, TYPE).getCPtr($csinput)"
%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & { %typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * { %typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& { %typemap(csout, excode=SWIGEXCODE) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) CONST TYPE { %typemap(csout, excode=SWIGEXCODE) CONST TYPE {
PROXYCLASS ret = new PROXYCLASS($imcall, true);$excode $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) CONST TYPE & { %typemap(csout, excode=SWIGEXCODE) CONST TYPE & {
PROXYCLASS ret = new PROXYCLASS($imcall, true);$excode $typemap(cstype, TYPE) ret = new $typemap(cstype, TYPE)($imcall, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) CONST TYPE * { %typemap(csout, excode=SWIGEXCODE) CONST TYPE * {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
%typemap(csout, excode=SWIGEXCODE) TYPE *CONST& { %typemap(csout, excode=SWIGEXCODE) TYPE *CONST& {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} }
@ -159,13 +159,13 @@
%typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{ %typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{
get { get {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} %} } %}
%typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{ %typemap(csvarout, excode=SWIGEXCODE2) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{
get { get {
IntPtr cPtr = $imcall; IntPtr cPtr = $imcall;
PROXYCLASS ret = (cPtr == IntPtr.Zero) ? null : new PROXYCLASS(cPtr, true);$excode $typemap(cstype, TYPE) ret = (cPtr == IntPtr.Zero) ? null : new $typemap(cstype, TYPE)(cPtr, true);$excode
return ret; return ret;
} %} } %}
@ -227,7 +227,6 @@
} }
} }
%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; %template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
%enddef %enddef

37
Lib/intrusive_ptr.i
View file

@ -44,18 +44,39 @@ struct SWIG_null_deleter {
%#define SWIG_NO_NULL_DELETER_1 %#define SWIG_NO_NULL_DELETER_1
} }
// Workaround empty first macro argument bug
#define SWIGEMPTYHACK
// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types // Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types
%define %intrusive_ptr(TYPE...)
%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
SWIG_INTRUSIVE_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE)
SWIG_INTRUSIVE_PTR_TYPEMAPS(const, TYPE)
%enddef
%define %intrusive_ptr_no_wrap(TYPE...)
%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(SWIGEMPTYHACK, TYPE)
SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(const, TYPE)
%enddef
// Legacy macros
%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...) %define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...)
%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } #warning "SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead."
SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, , TYPE) %intrusive_ptr(TYPE)
SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) %enddef
%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...)
#warning "SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead."
%intrusive_ptr(TYPE)
%enddef %enddef
// Extra user macro for including classes in intrusive_ptr typemaps for both const and non-const pointer types
// This caters for classes which cannot be wrapped by intrusive_ptrs but are still part of the class hierarchy
%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...) %define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...)
%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } #warning "SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead."
SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, , TYPE) %intrusive_ptr_no_wrap(TYPE)
SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, const, TYPE) %enddef
%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...)
#warning "SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead."
%intrusive_ptr_no_wrap(TYPE)
%enddef %enddef

40
Lib/java/boost_intrusive_ptr.i
View file

@ -1,7 +1,7 @@
%include <intrusive_ptr.i> %include <intrusive_ptr.i>
// Language specific macro implementing all the customisations for handling the smart pointer // Language specific macro implementing all the customisations for handling the smart pointer
%define SWIG_INTRUSIVE_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %define SWIG_INTRUSIVE_PTR_TYPEMAPS(CONST, TYPE...)
// %naturalvar is as documented for member variables // %naturalvar is as documented for member variables
%naturalvar TYPE; %naturalvar TYPE;
@ -207,48 +207,48 @@
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS" SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)"
%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, %typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *,
SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "PROXYCLASS.getCPtr($javainput)" SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)"
%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > { %typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & { %typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * { %typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& { %typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) CONST TYPE { %typemap(javaout) CONST TYPE {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE & { %typemap(javaout) CONST TYPE & {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE * { %typemap(javaout) CONST TYPE * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) TYPE *CONST& { %typemap(javaout) TYPE *CONST& {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
// Base proxy classes // Base proxy classes
@ -314,7 +314,7 @@
%include <shared_ptr.i> %include <shared_ptr.i>
%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(PROXYCLASS, CONST, TYPE...) %define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(CONST, TYPE...)
%naturalvar TYPE; %naturalvar TYPE;
%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; %naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;
@ -379,26 +379,26 @@
%typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong" %typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong"
%typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long" %typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long"
%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS" %typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE)"
%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS.getCPtr($javainput)" %typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE).getCPtr($javainput)"
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) CONST TYPE { %typemap(javaout) CONST TYPE {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE & { %typemap(javaout) CONST TYPE & {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE * { %typemap(javaout) CONST TYPE * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) TYPE *CONST& { %typemap(javaout) TYPE *CONST& {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
// Base proxy classes // Base proxy classes

22
Lib/java/boost_shared_ptr.i
View file

@ -1,7 +1,7 @@
%include <shared_ptr.i> %include <shared_ptr.i>
// Language specific macro implementing all the customisations for handling the smart pointer // Language specific macro implementing all the customisations for handling the smart pointer
%define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
// %naturalvar is as documented for member variables // %naturalvar is as documented for member variables
%naturalvar TYPE; %naturalvar TYPE;
@ -97,44 +97,44 @@
%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, %typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "PROXYCLASS" SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)"
%typemap(javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, %typemap(javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *,
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "PROXYCLASS.getCPtr($javainput)" SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)"
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& { %typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
%typemap(javaout) CONST TYPE { %typemap(javaout) CONST TYPE {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE & { %typemap(javaout) CONST TYPE & {
return new PROXYCLASS($jnicall, true); return new $typemap(jstype, TYPE)($jnicall, true);
} }
%typemap(javaout) CONST TYPE * { %typemap(javaout) CONST TYPE * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)/*ha*/(cPtr, true);
} }
%typemap(javaout) TYPE *CONST& { %typemap(javaout) TYPE *CONST& {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true); return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
} }
// Base proxy classes // Base proxy classes

2
Lib/octave/boost_shared_ptr.i
View file

@ -1,7 +1,7 @@
%include <shared_ptr.i> %include <shared_ptr.i>
// Language specific macro implementing all the customisations for handling the smart pointer // Language specific macro implementing all the customisations for handling the smart pointer
%define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
// %naturalvar is as documented for member variables // %naturalvar is as documented for member variables
%naturalvar TYPE; %naturalvar TYPE;

2
Lib/python/boost_shared_ptr.i
View file

@ -7,7 +7,7 @@
#endif #endif
// Language specific macro implementing all the customisations for handling the smart pointer // Language specific macro implementing all the customisations for handling the smart pointer
%define SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, CONST, TYPE...) %define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...)
// %naturalvar is as documented for member variables // %naturalvar is as documented for member variables
%naturalvar TYPE; %naturalvar TYPE;

19
Lib/shared_ptr.i
View file

@ -40,10 +40,23 @@ struct SWIG_null_deleter {
} }
// Workaround empty first macro argument bug
#define SWIGEMPTYHACK
// Main user macro for defining shared_ptr typemaps for both const and non-const pointer types // Main user macro for defining shared_ptr typemaps for both const and non-const pointer types
%define SWIG_SHARED_PTR(PROXYCLASS, TYPE...) %define %shared_ptr(TYPE...)
%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } %feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > }
SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, , TYPE) SWIG_SHARED_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE)
SWIG_SHARED_PTR_TYPEMAPS(PROXYCLASS, const, TYPE) SWIG_SHARED_PTR_TYPEMAPS(const, TYPE)
%enddef
// Legacy macros
%define SWIG_SHARED_PTR(PROXYCLASS, TYPE...)
#warning "SWIG_SHARED_PTR(PROXYCLASS, TYPE) is deprecated. Please use %shared_ptr(TYPE) instead."
%shared_ptr(TYPE)
%enddef
%define SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...)
#warning "SWIG_SHARED_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %shared_ptr(TYPE) instead."
%shared_ptr(TYPE)
%enddef %enddef