Mercurial > hg > octave-lyh
changeset 3503:d14c483b3c12
[project @ 2000-02-01 04:06:07 by jwe]
line wrap: on
line diff
--- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -31,7 +31,7 @@ #include <cassert> -#include <iostream.h> +#include <iostream> #include "Array.h"
--- a/liboctave/Array2.cc +++ b/liboctave/Array2.cc @@ -31,7 +31,7 @@ #include <cassert> -#include <iostream.h> +#include <iostream> #include "Array2.h"
--- a/liboctave/Array3.cc +++ b/liboctave/Array3.cc @@ -31,7 +31,7 @@ #include <cassert> -#include <iostream.h> +#include <iostream> #include "Array3.h"
--- a/liboctave/Bounds.cc +++ b/liboctave/Bounds.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "Bounds.h" #include "lo-error.h"
--- a/liboctave/Bounds.h +++ b/liboctave/Bounds.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dColVector.h"
--- a/liboctave/CColVector.cc +++ b/liboctave/CColVector.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "f77-fcn.h" #include "lo-error.h"
--- a/liboctave/CDiagMatrix.cc +++ b/liboctave/CDiagMatrix.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-error.h" #include "mx-base.h"
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -31,7 +31,7 @@ #include <cfloat> -#include <iostream.h> +#include <iostream> // XXX FIXME XXX #ifdef HAVE_SYS_TYPES_H
--- a/liboctave/CRowVector.cc +++ b/liboctave/CRowVector.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "f77-fcn.h" #include "lo-error.h"
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,12 @@ +2000-01-31 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-alloc.cc (octave_allocator::grow): Add std:: qualifier for + set_net_handler. + + * All source files: Include iostream, fstream, strstream, + etc. as needed instead of using forward declarations for these + classes. + 2000-01-30 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-time.cc: Declare strptime extern "C".
--- a/liboctave/CmplxAEPBAL.h +++ b/liboctave/CmplxAEPBAL.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> #include "CMatrix.h"
--- a/liboctave/CmplxCHOL.h +++ b/liboctave/CmplxCHOL.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "CMatrix.h"
--- a/liboctave/CmplxDET.h +++ b/liboctave/CmplxDET.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "oct-cmplx.h"
--- a/liboctave/CmplxHESS.h +++ b/liboctave/CmplxHESS.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "CMatrix.h"
--- a/liboctave/CmplxQR.h +++ b/liboctave/CmplxQR.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "CMatrix.h" #include "dbleQR.h"
--- a/liboctave/CmplxQRP.h +++ b/liboctave/CmplxQRP.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "CmplxQR.h"
--- a/liboctave/CmplxSCHUR.h +++ b/liboctave/CmplxSCHUR.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> #include "CMatrix.h"
--- a/liboctave/CmplxSVD.h +++ b/liboctave/CmplxSVD.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dDiagMatrix.h" #include "CMatrix.h"
--- a/liboctave/CollocWt.cc +++ b/liboctave/CollocWt.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "CollocWt.h" #include "f77-fcn.h"
--- a/liboctave/CollocWt.h +++ b/liboctave/CollocWt.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dMatrix.h" #include "dColVector.h"
--- a/liboctave/DiagArray2.cc +++ b/liboctave/DiagArray2.cc @@ -31,7 +31,7 @@ #include <cassert> -#include <iostream.h> +#include <iostream> #include "DiagArray2.h"
--- a/liboctave/EIG.h +++ b/liboctave/EIG.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dMatrix.h" #include "CMatrix.h"
--- a/liboctave/FEGrid.cc +++ b/liboctave/FEGrid.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "FEGrid.h" #include "lo-error.h"
--- a/liboctave/FEGrid.h +++ b/liboctave/FEGrid.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dColVector.h"
--- a/liboctave/LSODE.cc +++ b/liboctave/LSODE.cc @@ -31,7 +31,7 @@ #include <cfloat> #include <cmath> -#include <iostream.h> +#include <iostream> #include "LSODE.h" #include "f77-fcn.h"
--- a/liboctave/LSODE.h +++ b/liboctave/LSODE.h @@ -27,10 +27,6 @@ #pragma interface #endif -#if 0 -class ostream; -#endif - #include <cfloat> #include <cmath>
--- a/liboctave/LinConst.cc +++ b/liboctave/LinConst.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "LinConst.h" #include "lo-error.h"
--- a/liboctave/LinConst.h +++ b/liboctave/LinConst.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> class ColumnVector;
--- a/liboctave/Range.cc +++ b/liboctave/Range.cc @@ -32,7 +32,7 @@ #include <climits> #include <cmath> -#include <iostream.h> +#include <iostream> #include "Range.h" #include "dMatrix.h"
--- a/liboctave/Range.h +++ b/liboctave/Range.h @@ -27,8 +27,8 @@ #pragma interface #endif -class istream; -class ostream; +#include <iostream> + class Matrix; class
--- a/liboctave/boolMatrix.cc +++ b/liboctave/boolMatrix.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-error.h" #include "str-vec.h"
--- a/liboctave/chMatrix.cc +++ b/liboctave/chMatrix.cc @@ -29,10 +29,9 @@ #include <config.h> #endif +#include <iostream> #include <string> -#include <iostream.h> - #include "lo-error.h" #include "str-vec.h" #include "mx-base.h"
--- a/liboctave/cmd-hist.cc +++ b/liboctave/cmd-hist.cc @@ -39,7 +39,7 @@ #include <cstdlib> -#include <strstream.h> +#include <strstream> #ifdef HAVE_FCNTL_H #include <fcntl.h>
--- a/liboctave/dColVector.cc +++ b/liboctave/dColVector.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "f77-fcn.h" #include "lo-error.h"
--- a/liboctave/dDiagMatrix.cc +++ b/liboctave/dDiagMatrix.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-error.h" #include "mx-base.h"
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -31,7 +31,7 @@ #include <cfloat> -#include <iostream.h> +#include <iostream> #include "byte-swap.h" #include "dMatrix.h"
--- a/liboctave/dRowVector.cc +++ b/liboctave/dRowVector.cc @@ -29,7 +29,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "f77-fcn.h" #include "lo-error.h"
--- a/liboctave/data-conv.cc +++ b/liboctave/data-conv.cc @@ -26,7 +26,7 @@ #include <cctype> -#include <iostream.h> +#include <iostream> #include "byte-swap.h" #include "data-conv.h"
--- a/liboctave/dbleAEPBAL.h +++ b/liboctave/dbleAEPBAL.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> #include "dMatrix.h"
--- a/liboctave/dbleCHOL.h +++ b/liboctave/dbleCHOL.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dMatrix.h"
--- a/liboctave/dbleDET.h +++ b/liboctave/dbleDET.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> class DET
--- a/liboctave/dbleHESS.h +++ b/liboctave/dbleHESS.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dMatrix.h"
--- a/liboctave/dbleQR.h +++ b/liboctave/dbleQR.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dMatrix.h"
--- a/liboctave/dbleQRP.h +++ b/liboctave/dbleQRP.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dbleQR.h"
--- a/liboctave/dbleSCHUR.cc +++ b/liboctave/dbleSCHUR.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "dbleSCHUR.h" #include "f77-fcn.h"
--- a/liboctave/dbleSCHUR.h +++ b/liboctave/dbleSCHUR.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> #include "dMatrix.h"
--- a/liboctave/dbleSVD.cc +++ b/liboctave/dbleSVD.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "dbleSVD.h" #include "f77-fcn.h"
--- a/liboctave/dbleSVD.h +++ b/liboctave/dbleSVD.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> #include "dDiagMatrix.h" #include "dMatrix.h"
--- a/liboctave/file-ops.cc +++ b/liboctave/file-ops.cc @@ -29,7 +29,7 @@ #include <cstdlib> #include <cstring> -#include <iostream.h> +#include <iostream> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/liboctave/glob-match.cc +++ b/liboctave/glob-match.cc @@ -27,8 +27,7 @@ #include <fnmatch.h> #include <glob.h> -#include <iostream.h> - +#include <iostream> #include <string> #include "file-stat.h"
--- a/liboctave/idx-vector.cc +++ b/liboctave/idx-vector.cc @@ -30,7 +30,7 @@ #include <cstdlib> -#include <iostream.h> +#include <iostream> #include "Range.h" #include "boolMatrix.h"
--- a/liboctave/idx-vector.h +++ b/liboctave/idx-vector.h @@ -27,7 +27,8 @@ #pragma interface #endif -class ostream; +#include <iostream> + class ColumnVector; class boolMatrix; class Matrix;
--- a/liboctave/lo-sysdep.cc +++ b/liboctave/lo-sysdep.cc @@ -32,10 +32,9 @@ #include <config.h> #endif +#include <iostream> #include <string> -#include <iostream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/liboctave/mx-defs.h +++ b/liboctave/mx-defs.h @@ -72,9 +72,6 @@ #include "oct-cmplx.h" -class istream; -class ostream; - #ifndef MAPPER_FCN_TYPEDEFS #define MAPPER_FCN_TYPEDEFS 1
--- a/liboctave/oct-alloc.cc +++ b/liboctave/oct-alloc.cc @@ -91,8 +91,8 @@ { typedef void (*error_handler_function) (void); - error_handler_function f = set_new_handler (0); - set_new_handler (f); + error_handler_function f = std::set_new_handler (0); + std::set_new_handler (f); if (f) f ();
--- a/liboctave/oct-shlib.cc +++ b/liboctave/oct-shlib.cc @@ -29,7 +29,7 @@ #include <cstring> #endif -#include <strstream.h> +#include <strstream> extern "C" {
--- a/liboctave/str-vec.cc +++ b/liboctave/str-vec.cc @@ -32,10 +32,9 @@ #include <config.h> #endif +#include <iostream> #include <string> -#include <iostream.h> - #include "cmd-edit.h" #include "lo-utils.h" #include "str-vec.h"
--- a/liboctave/str-vec.h +++ b/liboctave/str-vec.h @@ -23,8 +23,7 @@ #if !defined (octave_str_vec_h) #define octave_str_vec_h 1 -class ostream; - +#include <iostream> #include <string> #include "Array.h"
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2000-01-31 John W. Eaton <jwe@bevo.che.wisc.edu> + + * sighandlers.cc (install_signal_handlers): Add std:: qualifier + for set_net_handler. + + * All source files: Include iostream, fstream, strstream, + etc. as needed instead of using forward declarations for these + classes. + 2000-01-30 John W. Eaton <jwe@bevo.che.wisc.edu> * input.cc (input_event_hook, Finput_event_hook): New functions.
--- a/src/Map.cc +++ b/src/Map.cc @@ -41,7 +41,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "Map.h"
--- a/src/Stack.cc +++ b/src/Stack.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "Stack.h"
--- a/src/defaults.cc +++ b/src/defaults.cc @@ -24,10 +24,9 @@ #include <config.h> #endif -#include <iostream.h> - #include <cstdlib> +#include <iostream> #include <string> #ifdef HAVE_UNISTD_H
--- a/src/defun.cc +++ b/src/defun.cc @@ -24,10 +24,9 @@ #include <config.h> #endif +#include <iostream> #include <string> -#include <iostream.h> - #include "defun-int.h" #include "dynamic-ld.h" #include "error.h"
--- a/src/dirfns.cc +++ b/src/dirfns.cc @@ -30,10 +30,9 @@ #include <cstdlib> #include <cstring> +#include <strstream> #include <string> -#include <strstream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/error.cc +++ b/src/error.cc @@ -27,10 +27,9 @@ #include <cstdarg> #include <cstring> +#include <strstream> #include <string> -#include <strstream.h> - #include "defun.h" #include "error.h" #include "pager.h"
--- a/src/error.h +++ b/src/error.h @@ -23,7 +23,7 @@ #if !defined (octave_error_h) #define octave_error_h 1 -class ostrstream; +#include <strstream> #define panic_impossible() \ panic ("impossible state reached in file `%s' at line %d", \
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -40,7 +40,7 @@ #include <climits> -#include <iostream.h> +#include <iostream> #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H
--- a/src/gripes.h +++ b/src/gripes.h @@ -27,7 +27,6 @@ class octave_value; - extern void gripe_not_supported (const char *);
--- a/src/help.cc +++ b/src/help.cc @@ -28,12 +28,11 @@ #include <cstdlib> #include <cstring> +#include <iostream> +#include <fstream> +#include <strstream> #include <string> -#include <iostream.h> -#include <fstream.h> -#include <strstream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/help.h +++ b/src/help.h @@ -23,8 +23,7 @@ #if !defined (octave_help_h) #define octave_help_h 1 -class ostrstream; - +#include <iostream> #include <string> class string_vector;
--- a/src/input.cc +++ b/src/input.cc @@ -32,10 +32,9 @@ #include <cassert> #include <csignal> +#include <iostream> #include <string> -#include <iostream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/lex.l +++ b/src/lex.l @@ -31,10 +31,9 @@ #include <cctype> #include <cstring> +#include <strstream> #include <string> -#include <strstream.h> - #include "SLStack.h" #include "cmd-edit.h"
--- a/src/load-save.cc +++ b/src/load-save.cc @@ -28,13 +28,12 @@ #include <cstring> #include <cctype> +#include <iomanip> +#include <iostream> +#include <fstream> +#include <strstream> #include <string> -#include <iomanip.h> -#include <iostream.h> -#include <fstream.h> -#include <strstream.h> - #include "byte-swap.h" #include "data-conv.h" #include "file-ops.h"
--- a/src/load-save.h +++ b/src/load-save.h @@ -23,12 +23,12 @@ #if !defined (octave_load_save_h) #define octave_load_save_h 1 -class ostream; +#include <iostream> + +#include <string> class octave_value; -#include <string> - extern bool save_ascii_data (ostream& os, const octave_value& t, const string& name = string (), bool strip_nan_and_inf = false,
--- a/src/oct-fstrm.h +++ b/src/oct-fstrm.h @@ -23,7 +23,7 @@ #if !defined (octave_octave_fstream_h) #define octave_octave_fstream_h 1 -#include <fstream.h> +#include <fstream> #include "oct-stream.h"
--- a/src/oct-hist.cc +++ b/src/oct-hist.cc @@ -41,7 +41,7 @@ #include <string> -#include <fstream.h> +#include <fstream> #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H
--- a/src/oct-iostrm.h +++ b/src/oct-iostrm.h @@ -23,13 +23,10 @@ #if !defined (octave_octave_iostream_h) #define octave_octave_iostream_h 1 -#include <iostream.h> +#include <iostream> #include "oct-stream.h" -class istream; -class ostream; - class octave_base_iostream : public octave_base_stream {
--- a/src/oct-procbuf.cc +++ b/src/oct-procbuf.cc @@ -26,7 +26,7 @@ #include <cerrno> -#include <iostream.h> +#include <iostream> #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -27,8 +27,8 @@ #include <cassert> #include <cstring> -#include <iomanip.h> -#include <strstream.h> +#include <iomanip> +#include <strstream> #include "lo-ieee.h" #include "lo-mappers.h"
--- a/src/oct-stream.h +++ b/src/oct-stream.h @@ -28,10 +28,8 @@ class octave_value; class octave_value_list; -class istream; -class ostream; -class ostrstream; - +#include <iostream> +#include <strstream> #include <string> #include "Array.h"
--- a/src/oct-strstrm.h +++ b/src/oct-strstrm.h @@ -23,10 +23,9 @@ #if !defined (octave_octave_strstream_h) #define octave_octave_strstream_h 1 +#include <strstream> #include <string> -#include <strstream.h> - #include "oct-stream.h" class
--- a/src/octave.cc +++ b/src/octave.cc @@ -32,9 +32,9 @@ #include <cstring> #include <ctime> -#include <fstream.h> -#include <iostream.h> -#include <strstream.h> +#include <fstream> +#include <iostream> +#include <strstream> #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H
--- a/src/ov-base-mat.cc +++ b/src/ov-base-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "oct-obj.h" #include "ov-base.h"
--- a/src/ov-base-mat.h +++ b/src/ov-base-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-base-scalar.cc +++ b/src/ov-base-scalar.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "ov-base.h" #include "ov-base-scalar.h"
--- a/src/ov-base-scalar.h +++ b/src/ov-base-scalar.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "lo-mappers.h" #include "lo-utils.h" #include "oct-alloc.h"
--- a/src/ov-base.cc +++ b/src/ov-base.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h"
--- a/src/ov-base.h +++ b/src/ov-base.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-bool-mat.cc +++ b/src/ov-bool-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "mx-base.h"
--- a/src/ov-bool-mat.h +++ b/src/ov-bool-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h"
--- a/src/ov-bool.cc +++ b/src/ov-bool.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "mx-base.h"
--- a/src/ov-bool.h +++ b/src/ov-bool.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "lo-utils.h" #include "mx-base.h" #include "oct-alloc.h"
--- a/src/ov-cell.cc +++ b/src/ov-cell.cc @@ -28,8 +28,8 @@ #include <config.h> #endif -#include <iostream.h> -#include <strstream.h> +#include <iostream> +#include <strstream> #include "lo-utils.h"
--- a/src/ov-cell.h +++ b/src/ov-cell.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h"
--- a/src/ov-ch-mat.cc +++ b/src/ov-ch-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "mx-base.h"
--- a/src/ov-ch-mat.h +++ b/src/ov-ch-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h"
--- a/src/ov-colon.cc +++ b/src/ov-colon.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "error.h" #include "pr-output.h"
--- a/src/ov-colon.h +++ b/src/ov-colon.h @@ -25,10 +25,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-complex.cc +++ b/src/ov-complex.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h"
--- a/src/ov-complex.h +++ b/src/ov-complex.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h"
--- a/src/ov-cx-mat.cc +++ b/src/ov-cx-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "mx-base.h"
--- a/src/ov-cx-mat.h +++ b/src/ov-cx-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h"
--- a/src/ov-file.cc +++ b/src/ov-file.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "oct-stream.h" #include "ops.h"
--- a/src/ov-file.h +++ b/src/ov-file.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "oct-alloc.h" #include "oct-stream.h" #include "ov-base.h"
--- a/src/ov-list.cc +++ b/src/ov-list.cc @@ -28,8 +28,8 @@ #include <config.h> #endif -#include <iostream.h> -#include <strstream.h> +#include <iostream> +#include <strstream> #include "lo-utils.h"
--- a/src/ov-list.h +++ b/src/ov-list.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-range.cc +++ b/src/ov-range.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "lo-utils.h"
--- a/src/ov-range.h +++ b/src/ov-range.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "Range.h" #include "lo-mappers.h"
--- a/src/ov-re-mat.cc +++ b/src/ov-re-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "lo-utils.h"
--- a/src/ov-re-mat.h +++ b/src/ov-re-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h"
--- a/src/ov-scalar.cc +++ b/src/ov-scalar.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "defun.h" #include "gripes.h"
--- a/src/ov-scalar.h +++ b/src/ov-scalar.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "lo-mappers.h" #include "lo-utils.h" #include "mx-base.h"
--- a/src/ov-str-mat.cc +++ b/src/ov-str-mat.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "lo-ieee.h" #include "mx-base.h"
--- a/src/ov-str-mat.h +++ b/src/ov-str-mat.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-struct.cc +++ b/src/ov-struct.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "error.h" #include "oct-lvalue.h"
--- a/src/ov-struct.h +++ b/src/ov-struct.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov-typeinfo.cc +++ b/src/ov-typeinfo.cc @@ -254,8 +254,6 @@ return false; } -#include <iostream.h> - unary_op_fcn octave_value_typeinfo::do_lookup_unary_op (octave_value::unary_op op, int t) {
--- a/src/ov-va-args.cc +++ b/src/ov-va-args.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "error.h" #include "pr-output.h"
--- a/src/ov-va-args.h +++ b/src/ov-va-args.h @@ -25,10 +25,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "mx-base.h" #include "str-vec.h"
--- a/src/ov.h +++ b/src/ov.h @@ -29,10 +29,9 @@ #include <cstdlib> +#include <iostream> #include <string> -class ostream; - #include "Range.h" #include "idx-vector.h" #include "mx-base.h"
--- a/src/pager.cc +++ b/src/pager.cc @@ -26,8 +26,8 @@ #include <csignal> +#include <fstream> #include <string> -#include <fstream.h> #include "cmd-edit.h" #include "oct-env.h"
--- a/src/pager.h +++ b/src/pager.h @@ -23,11 +23,10 @@ #if !defined (octave_pager_h) #define octave_pager_h 1 +#include <iostream> +#include <strstream> #include <string> -#include <iostream.h> -#include <strstream.h> - #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif
--- a/src/pr-output.cc +++ b/src/pr-output.cc @@ -29,12 +29,11 @@ #include <cstdio> #include <cstring> +#include <iomanip> +#include <iostream> +#include <strstream> #include <string> -#include <iomanip.h> -#include <iostream.h> -#include <strstream.h> - #include "CMatrix.h" #include "Range.h" #include "cmd-edit.h"
--- a/src/pr-output.h +++ b/src/pr-output.h @@ -23,7 +23,7 @@ #if !defined (octave_pr_output_h) #define octave_pr_output_h 1 -class ostream; +#include <iostream> #include "oct-cmplx.h"
--- a/src/procstream.h +++ b/src/procstream.h @@ -27,7 +27,7 @@ #pragma interface #endif -#include <iostream.h> +#include <iostream> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/pt-arg-list.cc +++ b/src/pt-arg-list.cc @@ -28,11 +28,10 @@ #include <config.h> #endif +#include <iostream> +#include <strstream> #include <string> -#include <iostream.h> -#include <strstream.h> - #include "str-vec.h" #include "error.h"
--- a/src/pt-assign.cc +++ b/src/pt-assign.cc @@ -28,8 +28,8 @@ #include <config.h> #endif -#include <iostream.h> -#include <strstream.h> +#include <iostream> +#include <strstream> #include "defun.h" #include "error.h"
--- a/src/pt-assign.h +++ b/src/pt-assign.h @@ -27,10 +27,9 @@ #pragma interface #endif +#include <iostream> #include <string> -class ostream; - class tree_argument_list; class tree_walker;
--- a/src/pt-cell.cc +++ b/src/pt-cell.cc @@ -28,8 +28,8 @@ #include <config.h> #endif -#include <iostream.h> -#include <strstream.h> +#include <iostream> +#include <strstream> #include "Cell.h" #include "defun.h"
--- a/src/pt-cell.h +++ b/src/pt-cell.h @@ -27,7 +27,7 @@ #pragma interface #endif -class ostream; +#include <iostream> class octave_value; class octave_value_list;
--- a/src/pt-const.cc +++ b/src/pt-const.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "error.h" #include "oct-obj.h"
--- a/src/pt-const.h +++ b/src/pt-const.h @@ -27,10 +27,9 @@ #pragma interface #endif +#include <iostream> #include <string> -class ostream; - #include "oct-alloc.h" #include "pt-exp.h"
--- a/src/pt-exp.cc +++ b/src/pt-exp.cc @@ -28,11 +28,10 @@ #include <config.h> #endif +#include <iostream> +#include <strstream> #include <string> -#include <iostream.h> -#include <strstream.h> - #include "error.h" #include "pager.h" #include "oct-lvalue.h"
--- a/src/pt-id.h +++ b/src/pt-id.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> class octave_value;
--- a/src/pt-indir.h +++ b/src/pt-indir.h @@ -27,8 +27,7 @@ #pragma interface #endif -class ostream; - +#include <iostream> #include <string> class octave_value;
--- a/src/pt-mat.cc +++ b/src/pt-mat.cc @@ -28,8 +28,8 @@ #include <config.h> #endif -#include <iostream.h> -#include <strstream.h> +#include <iostream> +#include <strstream> #include "defun.h" #include "error.h"
--- a/src/pt-plot.cc +++ b/src/pt-plot.cc @@ -30,12 +30,11 @@ #include <cstring> +#include <fstream> +#include <iostream> +#include <strstream> #include <string> -#include <fstream.h> -#include <iostream.h> -#include <strstream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/pt-plot.h +++ b/src/pt-plot.h @@ -27,8 +27,8 @@ #pragma interface #endif -class ostream; -class ostrstream; +#include <iostream> +#include <strstream> class tree_expression; class tree_plot_command;
--- a/src/pt-pr-code.cc +++ b/src/pt-pr-code.cc @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <iostream.h> +#include <iostream> #include "error.h" #include "ov-usr-fcn.h"
--- a/src/pt.cc +++ b/src/pt.cc @@ -28,11 +28,10 @@ #include <config.h> #endif +#include <iostream> +#include <strstream> #include <string> -#include <iostream.h> -#include <strstream.h> - #include "pt.h" #include "pt-pr-code.h"
--- a/src/pt.h +++ b/src/pt.h @@ -29,7 +29,7 @@ #include <string> -class ostream; +#include <iostream> class tree_walker;
--- a/src/sighandlers.cc +++ b/src/sighandlers.cc @@ -27,10 +27,9 @@ #include <cstdlib> #include <csignal> +#include <iostream> #include <new> -#include <iostream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -382,7 +381,7 @@ void install_signal_handlers (void) { - set_new_handler (octave_new_handler); + std::set_new_handler (octave_new_handler); octave_catch_interrupts ();
--- a/src/symtab.cc +++ b/src/symtab.cc @@ -32,8 +32,8 @@ #include <cctype> #include <climits> -#include <iomanip.h> -#include <fstream.h> +#include <iomanip> +#include <fstream> #include "glob-match.h" #include "str-vec.h"
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -31,10 +31,9 @@ #include <cstdlib> #include <cstring> +#include <iostream> #include <string> -#include <iostream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -30,12 +30,11 @@ #include <cstdlib> #include <cstring> +#include <fstream> +#include <iostream> +#include <strstream> #include <string> -#include <fstream.h> -#include <iostream.h> -#include <strstream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>
--- a/src/toplev.h +++ b/src/toplev.h @@ -25,14 +25,14 @@ #include <cstdio> +#include <string> + class octave_value; class octave_value_list; class octave_user_function; class tree_statement_list; class charMatrix; -#include <string> - extern void clean_up_and_exit (int) GCC_ATTR_NORETURN;
--- a/src/utils.cc +++ b/src/utils.cc @@ -28,12 +28,11 @@ #include <csetjmp> #include <cstring> +#include <fstream> +#include <iostream> +#include <strstream> #include <string> -#include <fstream.h> -#include <iostream.h> -#include <strstream.h> - #ifdef HAVE_UNISTD_H #ifdef HAVE_SYS_TYPES_H #include <sys/types.h>