nspace fixes for smart pointers

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12038 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2010-05-23 00:29:58 +00:00
commit 9c53d41e0f
3 changed files with 11 additions and 11 deletions

View file

@ -190,7 +190,7 @@
private HandleRef swigCPtr; private HandleRef swigCPtr;
private bool swigCMemOwnDerived; private bool swigCMemOwnDerived;
internal $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclassname_SWIGSmartPtrUpcast(cPtr), true) { internal $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclazznameSWIGSmartPtrUpcast(cPtr), true) {
swigCMemOwnDerived = cMemoryOwn; swigCMemOwnDerived = cMemoryOwn;
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new HandleRef(this, cPtr);
} }

View file

@ -256,7 +256,7 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnBase; private boolean swigCMemOwnBase;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
swigCMemOwnBase = cMemoryOwn; swigCMemOwnBase = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }
@ -271,8 +271,8 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnDerived; private boolean swigCMemOwnDerived;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
super($imclassname.$javaclassname_SWIGSmartPtrUpcast(cPtr), true); super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
swigCMemOwnDerived = cMemoryOwn; swigCMemOwnDerived = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }
@ -406,7 +406,7 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnBase; private boolean swigCMemOwnBase;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
swigCMemOwnBase = cMemoryOwn; swigCMemOwnBase = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }
@ -421,8 +421,8 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnDerived; private boolean swigCMemOwnDerived;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
super($imclassname.$javaclassname_SWIGSmartPtrUpcast(cPtr), true); super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
swigCMemOwnDerived = cMemoryOwn; swigCMemOwnDerived = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }

View file

@ -130,7 +130,7 @@
} }
%typemap(javaout) CONST TYPE * { %typemap(javaout) CONST TYPE * {
long cPtr = $jnicall; long cPtr = $jnicall;
return (cPtr == 0) ? null : new $typemap(jstype, TYPE)/*ha*/(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;
@ -142,7 +142,7 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnBase; private boolean swigCMemOwnBase;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
swigCMemOwnBase = cMemoryOwn; swigCMemOwnBase = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }
@ -157,8 +157,8 @@
private long swigCPtr; private long swigCPtr;
private boolean swigCMemOwnDerived; private boolean swigCMemOwnDerived;
protected $javaclassname(long cPtr, boolean cMemoryOwn) { public $javaclassname(long cPtr, boolean cMemoryOwn) {
super($imclassname.$javaclassname_SWIGSmartPtrUpcast(cPtr), true); super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true);
swigCMemOwnDerived = cMemoryOwn; swigCMemOwnDerived = cMemoryOwn;
swigCPtr = cPtr; swigCPtr = cPtr;
} }