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

[<arj...@us...>]

Revision: 12608
          http://sourceforge.net/p/plplot/code/12608
Author:   arjenmarkus
Date:     2013-10-19 18:05:40 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Moved two declarations of "cls" to the top of the function, as defining them in the middle of the executable code is a C++-like extension not accepted by MSVC/C++.
Also changed a comparison against NULL to an assignment of NULL.

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

Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i	2013-10-19 17:10:54 UTC (rev 12607)
+++ trunk/bindings/java/plplotjavac.i	2013-10-19 18:05:40 UTC (rev 12608)
@@ -441,7 +441,7 @@
     }
     else
     {
-        $1 == NULL;
+        $1 = NULL;
     }
 }
 %typemap( freearg ) const PLINT * ArrayCkNull {
@@ -1368,6 +1368,7 @@
         jdouble    jvalue;
         JNIEnv     *cbenv;
         jmethodID  labelID = 0;
+        jclass     cls;
 
         jaxis  = (jint) axis;
         jvalue = (jdouble) value;
@@ -1399,7 +1400,7 @@
             fprintf( stderr, "Error - callback undefined\n" );
             return;
         }
-        jclass cls = ( *cbenv )->GetObjectClass( cbenv, labelClass );
+        cls = ( *cbenv )->GetObjectClass( cbenv, labelClass );
         if ( cls == 0 )
         {
             fprintf( stderr, "Error getting callback class\n" );
@@ -1468,6 +1469,7 @@
         jobject      jdata;
         JNIEnv       *cbenv;
         jmethodID    ctID = 0;
+        jclass       cls;
 
         jx    = (jdouble) x;
         jy    = (jdouble) y;
@@ -1495,7 +1497,7 @@
             fprintf( stderr, "Error - callback undefined\n" );
             return;
         }
-        jclass cls = ( *cbenv )->GetObjectClass( cbenv, ctClass );
+        cls = ( *cbenv )->GetObjectClass( cbenv, ctClass );
         if ( cls == 0 )
         {
             fprintf( stderr, "Error getting callback class\n" );

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