Mercurial > octave

diff libinterp/dldfcn/__init_gnuplot__.cc @ 23024:a6a7b054e4ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rationalize #includes in libinterp/dldfcn directory. * symbfact.cc, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, gzip.cc, qr.cc, symrcm.cc: Add missing #includes and remove excess ones.
author Rik <rik@octave.org>
date Mon, 09 Jan 2017 09:38:33 -0800
parents 87e3163f6c87
children 4e3d47dc7e25
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_gnuplot__.cc	Sat Jan 07 20:12:16 2017 -0500
+++ b/libinterp/dldfcn/__init_gnuplot__.cc	Mon Jan 09 09:38:33 2017 -0800
@@ -33,13 +33,19 @@
 #  include "config.h"
 #endif
 
+#include <string>
+
+#include "dMatrix.h"
+#include "file-stat.h"
+#include "oct-env.h"
+
 #include "build-env.h"
 #include "builtin-defun-decls.h"
 #include "defun-dld.h"
 #include "error.h"
-#include "file-stat.h"
 #include "graphics.h"
-#include "oct-env.h"
+#include "ov.h"
+#include "ovl.h"
 #include "parse.h"
 #include "utils.h"
 #include "variables.h"
@@ -212,8 +218,6 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave_value retval;
-
   if (! have_gnuplot_binary ())
     error ("__init_gnuplot__: the gnuplot program is not available, see 'gnuplot_binary'");
   else if (! toolkit_loaded)
@@ -226,7 +230,7 @@
       toolkit_loaded = true;
     }
 
-  return retval;
+  return octave_value_list ();
 }
 
 DEFUN_DLD (__have_gnuplot__, , ,
@@ -235,11 +239,7 @@
 Undocumented internal function.
 @end deftypefn */)
 {
-  octave_value retval;
-
-  retval = have_gnuplot_binary ();
-
-  return retval;
+  return ovl (have_gnuplot_binary ());
 }
 
 /*