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

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12037 626c5289-ae23-0410-ae9c-e8d60b6d4f22

2 files changed, 31 insertions, 31 deletions

diff --git a/Lib/java/boost_intrusive_ptr.i b/Lib/java/boost_intrusive_ptr.i
index 28446908f..52cf42b44 100644
--- a/Lib/java/boost_intrusive_ptr.i
+++ b/Lib/java/boost_intrusive_ptr.i
@@ -1,7 +1,7 @@
 %include <intrusive_ptr.i>

 

 // 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 TYPE;

@@ -207,48 +207,48 @@
                   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 > *& "PROXYCLASS"

+                  SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)"

 %typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_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 > *& "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 > {

     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 > {

     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 > & {

     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 > * {

     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 > *& {

     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 {

-    return new PROXYCLASS($jnicall, true);

+    return new $typemap(jstype, TYPE)($jnicall, true);

   }

 %typemap(javaout) CONST TYPE & {

-    return new PROXYCLASS($jnicall, true);

+    return new $typemap(jstype, TYPE)($jnicall, true);

   }

 %typemap(javaout) CONST TYPE * {

     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& {

     long cPtr = $jnicall;

-    return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true);

+    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);

   }

 

 // Base proxy classes

@@ -314,7 +314,7 @@
 

 %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 SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >;

@@ -379,26 +379,26 @@
 

 %typemap (jni)    SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong"

 %typemap (jtype)  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long"

-%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS"

-%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "PROXYCLASS.getCPtr($javainput)"

+%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE)"

+%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 > {

     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 {

-    return new PROXYCLASS($jnicall, true);

+    return new $typemap(jstype, TYPE)($jnicall, true);

   }

 %typemap(javaout) CONST TYPE & {

-    return new PROXYCLASS($jnicall, true);

+    return new $typemap(jstype, TYPE)($jnicall, true);

   }

 %typemap(javaout) CONST TYPE * {

     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& {

     long cPtr = $jnicall;

-    return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true);

+    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);

   }

 

 // Base proxy classes

diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i
index 5b89cafb7..06d839e2e 100644
--- a/Lib/java/boost_shared_ptr.i
+++ b/Lib/java/boost_shared_ptr.i
@@ -1,7 +1,7 @@
 %include <shared_ptr.i>
 
 // 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 TYPE;
@@ -97,44 +97,44 @@
 %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 > *& "PROXYCLASS"
+                  SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& "$typemap(jstype, 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 > *& "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 > {
     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 > & {
     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 > * {
     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 > *& {
     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 {
-    return new PROXYCLASS($jnicall, true);
+    return new $typemap(jstype, TYPE)($jnicall, true);
   }
 %typemap(javaout) CONST TYPE & {
-    return new PROXYCLASS($jnicall, true);
+    return new $typemap(jstype, TYPE)($jnicall, true);
   }
 %typemap(javaout) CONST TYPE * {
     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& {
     long cPtr = $jnicall;
-    return (cPtr == 0) ? null : new PROXYCLASS(cPtr, true);
+    return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true);
   }
 
 // Base proxy classes