[Plplot-cvs] SF.net SVN: plplot:[11702] trunk/bindings/java/plplotjavac.i

[<ai...@us...>]

Revision: 11702
          http://plplot.svn.sourceforge.net/plplot/?rev=11702&view=rev
Author:   airwin
Date:     2011-04-13 18:16:33 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
It turns out (see section 10.4.1 of swig documentation) that both "{
}" and "%{ %}" can be used for typemaps depending on the scope that is
desired.  So use "{ }" for three of the typemaps following what is
done in /usr/share/swig1.3/java/typemaps.i.  That change causes no
problems for our styling script and also builds and tests without
issues.

Modified Paths:
--------------
    trunk/bindings/java/plplotjavac.i

Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i	2011-04-13 05:24:00 UTC (rev 11701)
+++ trunk/bindings/java/plplotjavac.i	2011-04-13 18:16:33 UTC (rev 11702)
@@ -110,7 +110,7 @@
 %typemap( javadirectorout ) TYPE * OUTPUT, TYPE & OUTPUT "$javacall"
 
 %typemap( in ) TYPE * OUTPUT( $*1_ltype temp ), TYPE &OUTPUT( $*1_ltype temp )
-%{
+{
     if ( !$input )
     {
         SWIG_JavaThrowException( jenv, SWIG_JavaNullPointerException, "array null" );
@@ -122,7 +122,7 @@
         return $null;
     }
     $1 = &temp;
-%}
+}
 
 %typemap( directorin, descriptor = JNIDESC ) TYPE & OUTPUT
 %{
@@ -130,16 +130,16 @@
 %}
 
 %typemap( directorin, descriptor = JNIDESC, warning = "Need to provide TYPE *OUTPUT directorin typemap, TYPE array length is unknown" ) TYPE * OUTPUT
-%{
-%}
+{
+}
 
 %typemap( freearg ) TYPE * OUTPUT, TYPE & OUTPUT ""
 
 %typemap( argout ) TYPE * OUTPUT, TYPE & OUTPUT
-%{
+{
     JNITYPE jvalue = (JNITYPE) temp$argnum;
     JCALL4( Set ## JAVATYPE ## ArrayRegion, jenv, $input, 0, 1, &jvalue );
-%}
+}
 
 %typemap( typecheck ) TYPE * INOUT = TYPECHECKTYPE;
 %typemap( typecheck ) TYPE &INOUT  = TYPECHECKTYPE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.