[Plplot-cvs] SF.net SVN: plplot:[11390] trunk/bindings

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

Revision: 11390
          http://plplot.svn.sourceforge.net/plplot/?rev=11390&view=rev
Author:   airwin
Date:     2010-12-26 23:14:13 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
Sort out plSetOpt versus plsetop issues for our swig-generated octave
bindings.

Modified Paths:
--------------
    trunk/bindings/octave/plplot_octave.i
    trunk/bindings/swig-support/plplotcapi.i

Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i	2010-12-26 23:10:33 UTC (rev 11389)
+++ trunk/bindings/octave/plplot_octave.i	2010-12-26 23:14:13 UTC (rev 11390)
@@ -216,3 +216,5 @@
 %}
 /* swig compatible PLplot API definitions from here on. */
 %include plplotcapi.i
+// Our Octave interfaces define plsetopt.m which relies on plSetOpt internally.
+int plSetOpt( const char *opt, const char *optarg );

Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i	2010-12-26 23:10:33 UTC (rev 11389)
+++ trunk/bindings/swig-support/plplotcapi.i	2010-12-26 23:14:13 UTC (rev 11390)
@@ -5,7 +5,7 @@
 //
 //
 //Copyright (C) 2002  Gary Bishop
-//Copyright (C) 2002, 2004  Alan W. Irwin
+//Copyright (C) 2002-2010  Alan W. Irwin
 //Copyright (C) 2004  Rafael Laboissiere
 //Copyright (C) 2004  Andrew Ross
 //
@@ -761,9 +761,12 @@
 void
 plsesc( char esc );
 
+// Octave has its own definition of plsetopt(.m)
+#if !defined ( SWIG_OCTAVE )
 %feature( "autodoc", "Process input strings, treating them as an option and argument pair. The first is for the external API, the second the work routine declared here for backward compatibility." ) plsetopt;
 PLINT
 plsetopt( const char *opt, const char *optarg );
+#endif
 
 %feature( "autodoc", "Set family file parameters." ) plsfam;
 void


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