[Plplot-cvs] SF.net SVN: plplot:[12267] trunk/bindings/octave/plplot_octave.i

[<and...@us...>]

Revision: 12267
          http://plplot.svn.sourceforge.net/plplot/?rev=12267&view=rev
Author:   andrewross
Date:     2012-11-02 12:18:44 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Fix warnings with octave bindings from API changes in octave 3.4 upwards.

Modified Paths:
--------------
    trunk/bindings/octave/plplot_octave.i

Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i	2012-11-02 10:00:45 UTC (rev 12266)
+++ trunk/bindings/octave/plplot_octave.i	2012-11-02 12:18:44 UTC (rev 12267)
@@ -34,6 +34,11 @@
 %module plplot_octave
 
 %{
+
+// #undef PACKAGE and VERSION macros which are leaked out by the octave headers
+#undef PACKAGE
+#undef VERSION
+
 #include "plplotP.h"
 
 // Temporary fix for problems with -fvisibility=hidden and octave headers.
@@ -665,7 +670,12 @@
 // charMatrix, etc.
 %typemap( in, numinputs = 0 ) char *OUTPUT( octave_value_list retval )
 {
+// Check if version >= 3.4.0
+%#if OCTAVE_API_VERSION_NUMBER < 45
     retval( 0 ) = octave_value( charMatrix( 80, 1 ), true );
+%#else
+    retval( 0 ) = octave_value( charMatrix( 80, 1 ) );
+%#endif
     $1          = (char *) retval( 0 ).char_matrix_value().data();
 }
 %typemap( argout ) char *OUTPUT {

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