Mercurial > octave
changeset 25438:cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
Using <iostream> brings with it a static initializer for the std::cin,
std::cout, and std::cerr streams. In most cases they are not needed
and should be avoided if possible.
Files affected:
build-aux/mk-opts.pl
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
libinterp/corefcn/__dsearchn__.cc
libinterp/corefcn/c-file-ptr-stream.cc
libinterp/corefcn/c-file-ptr-stream.h
libinterp/corefcn/daspk.cc
libinterp/corefcn/dasrt.cc
libinterp/corefcn/dassl.cc
libinterp/corefcn/defaults.cc
libinterp/corefcn/defun.cc
libinterp/corefcn/file-io.cc
libinterp/corefcn/ft-text-renderer.cc
libinterp/corefcn/gl-render.cc
libinterp/corefcn/help.cc
libinterp/corefcn/ls-ascii-helper.cc
libinterp/corefcn/ls-hdf5.cc
libinterp/corefcn/ls-hdf5.h
libinterp/corefcn/ls-mat-ascii.cc
libinterp/corefcn/ls-mat4.cc
libinterp/corefcn/ls-mat5.cc
libinterp/corefcn/ls-oct-binary.cc
libinterp/corefcn/ls-oct-text.cc
libinterp/corefcn/lsode.cc
libinterp/corefcn/oct-iostrm.cc
libinterp/corefcn/oct-procbuf.cc
libinterp/corefcn/oct-stdstrm.h
libinterp/corefcn/procstream.cc
libinterp/corefcn/procstream.h
libinterp/corefcn/quad.cc
libinterp/corefcn/symscope.h
libinterp/corefcn/symtab.h
libinterp/corefcn/toplev.cc
libinterp/corefcn/urlwrite.cc
libinterp/corefcn/utils.cc
libinterp/corefcn/zfstream.cc
libinterp/dldfcn/__ode15__.cc
libinterp/dldfcn/convhulln.cc
libinterp/octave-value/ov-base-diag.cc
libinterp/octave-value/ov-base-int.cc
libinterp/octave-value/ov-base-mat.cc
libinterp/octave-value/ov-base-scalar.cc
libinterp/octave-value/ov-base-sparse.cc
libinterp/octave-value/ov-base.cc
libinterp/octave-value/ov-bool-mat.cc
libinterp/octave-value/ov-bool-sparse.cc
libinterp/octave-value/ov-bool.cc
libinterp/octave-value/ov-cell.cc
libinterp/octave-value/ov-ch-mat.cc
libinterp/octave-value/ov-class.cc
libinterp/octave-value/ov-colon.cc
libinterp/octave-value/ov-complex.cc
libinterp/octave-value/ov-cs-list.cc
libinterp/octave-value/ov-cx-mat.cc
libinterp/octave-value/ov-cx-sparse.cc
libinterp/octave-value/ov-fcn-handle.cc
libinterp/octave-value/ov-fcn-inline.cc
libinterp/octave-value/ov-float.cc
libinterp/octave-value/ov-flt-complex.cc
libinterp/octave-value/ov-flt-cx-mat.cc
libinterp/octave-value/ov-flt-re-mat.cc
libinterp/octave-value/ov-int16.cc
libinterp/octave-value/ov-int32.cc
libinterp/octave-value/ov-int64.cc
libinterp/octave-value/ov-int8.cc
libinterp/octave-value/ov-java.cc
libinterp/octave-value/ov-range.cc
libinterp/octave-value/ov-re-mat.cc
libinterp/octave-value/ov-re-sparse.cc
libinterp/octave-value/ov-scalar.cc
libinterp/octave-value/ov-str-mat.cc
libinterp/octave-value/ov-struct.cc
libinterp/octave-value/ov-typeinfo.cc
libinterp/octave-value/ov-uint16.cc
libinterp/octave-value/ov-uint32.cc
libinterp/octave-value/ov-uint64.cc
libinterp/octave-value/ov-uint8.cc
libinterp/octave.cc
libinterp/parse-tree/bp-table.cc
libinterp/parse-tree/lex.h
libinterp/parse-tree/profiler.cc
libinterp/parse-tree/pt-arg-list.cc
libinterp/parse-tree/pt-array-list.cc
libinterp/parse-tree/pt-assign.cc
libinterp/parse-tree/pt-cell.cc
libinterp/parse-tree/pt-const.cc
libinterp/parse-tree/pt-eval.cc
libinterp/parse-tree/pt-exp.cc
libinterp/parse-tree/pt-fcn-handle.cc
libinterp/parse-tree/pt-jit.cc
libinterp/parse-tree/pt-pr-code.cc
libinterp/parse-tree/pt-tm-const.cc
libinterp/parse-tree/pt.cc
liboctave/array/Array.cc
liboctave/array/CColVector.cc
liboctave/array/CDiagMatrix.cc
liboctave/array/CMatrix.cc
liboctave/array/CNDArray.cc
liboctave/array/CRowVector.cc
liboctave/array/CSparse.cc
liboctave/array/DiagArray2.cc
liboctave/array/MArray.cc
liboctave/array/Range.cc
liboctave/array/Sparse.cc
liboctave/array/boolMatrix.cc
liboctave/array/boolSparse.cc
liboctave/array/chMatrix.cc
liboctave/array/dColVector.cc
liboctave/array/dDiagMatrix.cc
liboctave/array/dMatrix.cc
liboctave/array/dNDArray.cc
liboctave/array/dRowVector.cc
liboctave/array/dSparse.cc
liboctave/array/fCColVector.cc
liboctave/array/fCDiagMatrix.cc
liboctave/array/fCMatrix.cc
liboctave/array/fCNDArray.cc
liboctave/array/fCRowVector.cc
liboctave/array/fColVector.cc
liboctave/array/fDiagMatrix.cc
liboctave/array/fMatrix.cc
liboctave/array/fNDArray.cc
liboctave/array/fRowVector.cc
liboctave/array/idx-vector.cc
liboctave/numeric/CollocWt.cc
liboctave/numeric/eigs-base.cc
liboctave/system/file-ops.cc
liboctave/system/oct-time.cc
liboctave/util/cmd-hist.cc
liboctave/util/data-conv.cc
liboctave/util/data-conv.h
liboctave/util/file-info.cc
liboctave/util/lo-utils.cc
liboctave/util/lo-utils.h
liboctave/util/quit.cc
liboctave/util/str-vec.cc
liboctave/util/url-transfer.cc
liboctave/util/url-transfer.h
line wrap: on
line diff
--- a/build-aux/mk-opts.pl Wed Jun 06 13:13:20 2018 -0400 +++ b/build-aux/mk-opts.pl Thu Jun 07 10:11:54 2018 -0400 @@ -512,7 +512,8 @@ // this file. #include <iomanip> -#include <iostream> +#include <ostream> +#include <sstream> #include "$header"
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Wed Jun 06 13:13:20 2018 -0400 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Jun 07 10:11:54 2018 -0400 @@ -52,7 +52,6 @@ #include <versionhelpers.h> #include <cstring> #include <csignal> -#include <limits> #include "QWinTerminalImpl.h" #include "QTerminalColors.h"
--- a/libinterp/corefcn/__dsearchn__.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/__dsearchn__.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,8 +26,6 @@ #include <cmath> -#include <iostream> -#include <fstream> #include <string> #include "defun.h"
--- a/libinterp/corefcn/c-file-ptr-stream.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <iomanip> #include "filepos-wrappers.h"
--- a/libinterp/corefcn/c-file-ptr-stream.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.h Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,7 @@ #include <cstdio> -#include <iostream> +#include <iosfwd> #include <streambuf> class
--- a/libinterp/corefcn/daspk.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/daspk.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,9 +26,6 @@ #include <string> -#include <iomanip> -#include <iostream> - #include "DASPK.h" #include "defun.h"
--- a/libinterp/corefcn/dasrt.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/dasrt.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,6 @@ # include "config.h" #endif -#include <iostream> #include <string> #include "DASRT.h"
--- a/libinterp/corefcn/dassl.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/dassl.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,9 +26,6 @@ #include <string> -#include <iomanip> -#include <iostream> - #include "DASSL.h" #include "defun.h"
--- a/libinterp/corefcn/defaults.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/defaults.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,6 @@ #include <cstdlib> #include <algorithm> -#include <iostream> #include <string> #include "dir-ops.h"
--- a/libinterp/corefcn/defun.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/defun.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,8 +24,6 @@ # include "config.h" #endif -#include <sstream> -#include <iostream> #include <string> #include "call-stack.h"
--- a/libinterp/corefcn/file-io.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/file-io.cc Thu Jun 07 10:11:54 2018 -0400 @@ -41,8 +41,7 @@ #include <cerrno> #include <cstdio> -#include <iostream> -#include <limits> +#include <iomanip> #include <stack> #include <string> #include <vector>
--- a/libinterp/corefcn/ft-text-renderer.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ft-text-renderer.cc Thu Jun 07 10:11:54 2018 -0400 @@ -48,7 +48,6 @@ #include <clocale> #include <cwchar> -#include <iostream> #include <map> #include <utility>
--- a/libinterp/corefcn/gl-render.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/gl-render.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <sstream> #if defined (HAVE_WINDOWS_H) # define WIN32_LEAN_AND_MEAN
--- a/libinterp/corefcn/help.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/help.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,7 +29,7 @@ #include <algorithm> #include <fstream> -#include <iostream> +#include <istream> #include <map> #include <sstream> #include <string>
--- a/libinterp/corefcn/ls-ascii-helper.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-ascii-helper.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,7 @@ #include "ls-ascii-helper.h" -#include <iostream> +#include <istream> #include <sstream> // Helper functions when reading from ascii files.
--- a/libinterp/corefcn/ls-hdf5.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-hdf5.cc Thu Jun 07 10:11:54 2018 -0400 @@ -31,8 +31,9 @@ #include <cctype> #include <iomanip> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <string> #include <vector>
--- a/libinterp/corefcn/ls-hdf5.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-hdf5.h Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#include <iostream> +#include <iosfwd> #include "oct-hdf5-types.h" #include "ov.h"
--- a/libinterp/corefcn/ls-mat-ascii.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-mat-ascii.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,8 @@ #include <cctype> #include <iomanip> -#include <iostream> +#include <istream> +#include <ostream> #include <sstream> #include <string>
--- a/libinterp/corefcn/ls-mat4.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-mat4.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ #endif #include <iomanip> -#include <iostream> +#include <istream> +#include <ostream> #include <string> #include "byte-swap.h"
--- a/libinterp/corefcn/ls-mat5.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,8 +29,9 @@ #include <cstring> #include <iomanip> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <sstream> #include <string> #include <vector>
--- a/libinterp/corefcn/ls-oct-binary.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-oct-binary.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <string> #include "byte-swap.h"
--- a/libinterp/corefcn/ls-oct-text.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/ls-oct-text.cc Thu Jun 07 10:11:54 2018 -0400 @@ -31,7 +31,8 @@ #include <fstream> #include <iomanip> -#include <iostream> +#include <istream> +#include <ostream> #include <sstream> #include <string>
--- a/libinterp/corefcn/lsode.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/lsode.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,9 +26,6 @@ #include <string> -#include <iomanip> -#include <iostream> - #include "LSODE.h" #include "lo-mappers.h"
--- a/libinterp/corefcn/oct-iostrm.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/oct-iostrm.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "error.h" #include "oct-iostrm.h"
--- a/libinterp/corefcn/oct-procbuf.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/oct-procbuf.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,7 @@ #include <cerrno> -#include <iostream> +#include <iomanip> // FIXME: we would prefer to avoid including these directly in Octave // sources, but eliminating them is complicated by the mingling of
--- a/libinterp/corefcn/oct-stdstrm.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/oct-stdstrm.h Thu Jun 07 10:11:54 2018 -0400 @@ -25,6 +25,8 @@ #include "octave-config.h" +#include <iomanip> + #include "oct-stream.h" #include "c-file-ptr-stream.h"
--- a/libinterp/corefcn/procstream.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/procstream.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <iomanip> #include "procstream.h"
--- a/libinterp/corefcn/procstream.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/procstream.h Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,7 @@ #include "octave-config.h" -#include <istream> -#include <ostream> +#include <iosfwd> #include <string> #include <sys/types.h>
--- a/libinterp/corefcn/quad.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/quad.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,9 +26,6 @@ #include <string> -#include <iomanip> -#include <iostream> - #include "Quad.h" #include "lo-mappers.h"
--- a/libinterp/corefcn/symscope.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/symscope.h Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,6 @@ #include "octave-config.h" #include <deque> -#include <limits> #include <list> #include <map> #include <memory>
--- a/libinterp/corefcn/symtab.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/symtab.h Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,6 @@ #include "octave-config.h" #include <deque> -#include <limits> #include <list> #include <map> #include <set>
--- a/libinterp/corefcn/toplev.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/toplev.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,8 +26,8 @@ #include <cerrno> #include <cstdlib> + #include <new> - #include <sstream> #include <string>
--- a/libinterp/corefcn/urlwrite.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/urlwrite.cc Thu Jun 07 10:11:54 2018 -0400 @@ -31,7 +31,6 @@ #include <string> #include <fstream> #include <iomanip> -#include <iostream> #include "dir-ops.h" #include "file-ops.h"
--- a/libinterp/corefcn/utils.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/utils.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,8 +29,8 @@ #include <cstring> #include <fstream> -#include <iostream> #include <limits> +#include <ostream> #include <string> #include "dir-ops.h"
--- a/libinterp/corefcn/zfstream.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/corefcn/zfstream.cc Thu Jun 07 10:11:54 2018 -0400 @@ -34,7 +34,9 @@ # include "config.h" #endif -#include <iostream> +#include <iomanip> +#include <istream> +#include <ostream> #include "zfstream.h"
--- a/libinterp/dldfcn/__ode15__.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/dldfcn/__ode15__.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,6 +24,8 @@ # include "config.h" #endif +#include <iostream> + #include "dColVector.h" #include "dMatrix.h" #include "dSparse.h"
--- a/libinterp/dldfcn/convhulln.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/dldfcn/convhulln.cc Thu Jun 07 10:11:54 2018 -0400 @@ -33,7 +33,6 @@ # include "config.h" #endif -#include <iostream> #include <limits> #include <string>
--- a/libinterp/octave-value/ov-base-diag.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base-diag.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,9 @@ // C++ source files that should have included config.h before including // this file. -#include <iostream> +#include <istream> +#include <ostream> +#include <sstream> #include "mach-info.h" #include "lo-ieee.h"
--- a/libinterp/octave-value/ov-base-int.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base-int.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,8 +24,10 @@ // C++ source files that should have included config.h before including // this file. -#include <iostream> +#include <istream> #include <limits> +#include <ostream> +#include <sstream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-base-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ // C++ source files that should have included config.h before including // this file. -#include <iostream> +#include <ostream> +#include <sstream> #include "Array-util.h"
--- a/libinterp/octave-value/ov-base-scalar.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base-scalar.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ // C++ source files that should have included config.h before including // this file. -#include <iostream> +#include <ostream> +#include <sstream> #include "oct-inttypes.h"
--- a/libinterp/octave-value/ov-base-sparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base-sparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,9 @@ // this file. #include <iomanip> -#include <iostream> +#include <istream> +#include <ostream> +#include <sstream> #include "ovl.h" #include "ov-base.h"
--- a/libinterp/octave-value/ov-base.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-base.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "lo-ieee.h" #include "lo-mappers.h"
--- a/libinterp/octave-value/ov-bool-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-bool-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-bool-sparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-bool-sparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,8 @@ # include "config.h" #endif -#include <iostream> -#include <limits> +#include <istream> +#include <ostream> #include <vector> #include "dim-vector.h"
--- a/libinterp/octave-value/ov-bool.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-bool.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "oct-inttypes.h"
--- a/libinterp/octave-value/ov-cell.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-cell.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,8 @@ # include "config.h" #endif -#include <iomanip> -#include <iostream> +#include <istream> +#include <ostream> #include <sstream> #include <vector> #include <queue>
--- a/libinterp/octave-value/ov-ch-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-ch-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,7 @@ #endif #include <cctype> -#include <iostream> +#include <ostream> #include "dNDArray.h" #include "fNDArray.h"
--- a/libinterp/octave-value/ov-class.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-class.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "byte-swap.h"
--- a/libinterp/octave-value/ov-colon.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-colon.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "error.h" #include "pr-output.h"
--- a/libinterp/octave-value/ov-complex.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-complex.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <sstream> #include "lo-ieee.h"
--- a/libinterp/octave-value/ov-cs-list.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-cs-list.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <sstream> - #include "lo-utils.h" #include "defun.h"
--- a/libinterp/octave-value/ov-cx-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-cx-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-cx-sparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-cx-sparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,8 @@ # include "config.h" #endif -#include <iostream> -#include <limits> +#include <istream> +#include <ostream> #include <vector> #include "lo-specfun.h"
--- a/libinterp/octave-value/ov-fcn-handle.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,8 +26,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <list> +#include <ostream> #include <sstream> #include <vector>
--- a/libinterp/octave-value/ov-fcn-inline.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-fcn-inline.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,7 +29,7 @@ #endif #include <istream> -#include <iostream> +#include <ostream> #include <sstream> #include <vector>
--- a/libinterp/octave-value/ov-float.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-float.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "oct-inttypes.h"
--- a/libinterp/octave-value/ov-flt-complex.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-flt-complex.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "lo-ieee.h" #include "lo-specfun.h"
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-flt-re-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-int16.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-int16.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-int32.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-int32.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-int64.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-int64.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-int8.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-int8.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-java.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-java.cc Thu Jun 07 10:11:54 2018 -0400 @@ -34,9 +34,9 @@ #endif #include <algorithm> -#include <map> +#include <fstream> #include <iostream> -#include <fstream> +#include <map> #include <string> #include <vector>
--- a/libinterp/octave-value/ov-range.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-range.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> +#include <sstream> #include "dNDArray.h" #include "fNDArray.h"
--- a/libinterp/octave-value/ov-re-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-re-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <vector> #include "dNDArray.h"
--- a/libinterp/octave-value/ov-re-sparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-re-sparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <vector> #include "lo-specfun.h"
--- a/libinterp/octave-value/ov-scalar.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-scalar.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "oct-inttypes.h"
--- a/libinterp/octave-value/ov-str-mat.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-str-mat.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,8 @@ #include <cctype> -#include <iostream> +#include <istream> +#include <ostream> #include <vector> #include "data-conv.h"
--- a/libinterp/octave-value/ov-struct.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-struct.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Cell.h" #include "builtin-defun-decls.h"
--- a/libinterp/octave-value/ov-typeinfo.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-typeinfo.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,6 +24,8 @@ # include "config.h" #endif +#include <iostream> + #include "Array.h" #include "defun.h"
--- a/libinterp/octave-value/ov-uint16.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-uint16.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-uint32.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-uint32.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-uint64.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-uint64.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave-value/ov-uint8.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave-value/ov-uint8.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,9 +24,6 @@ # include "config.h" #endif -#include <iostream> -#include <limits> - #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h"
--- a/libinterp/octave.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/octave.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,6 +26,7 @@ # include "config.h" #endif +#include <iostream> #include <string> #include "file-ops.h"
--- a/libinterp/parse-tree/bp-table.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/bp-table.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,14 +26,11 @@ #endif #include <algorithm> -#include <fstream> #include <limits> #include <list> #include <map> #include <set> #include <string> -#include <sstream> -#include <iostream> #include "file-ops.h"
--- a/libinterp/parse-tree/lex.h Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/lex.h Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,6 @@ #include "octave-config.h" #include <deque> -#include <limits> #include <list> #include <set> #include <stack>
--- a/libinterp/parse-tree/profiler.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/profiler.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,6 @@ # include "config.h" #endif -#include <iostream> - #include "defun.h" #include "interpreter.h" #include "oct-time.h"
--- a/libinterp/parse-tree/pt-arg-list.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-arg-list.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,6 @@ # include "config.h" #endif -#include <iostream> #include <string> #include "str-vec.h"
--- a/libinterp/parse-tree/pt-array-list.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-array-list.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,8 +24,6 @@ # include "config.h" #endif -#include <iostream> - #include "quit.h" #include "error.h"
--- a/libinterp/parse-tree/pt-assign.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-assign.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,6 @@ # include "config.h" #endif -#include <iostream> #include <string> #include "error.h"
--- a/libinterp/parse-tree/pt-cell.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-cell.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,8 +24,6 @@ # include "config.h" #endif -#include <iostream> - #include "Cell.h" #include "ovl.h" #include "pt-arg-list.h"
--- a/libinterp/parse-tree/pt-const.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-const.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "error.h" #include "ovl.h"
--- a/libinterp/parse-tree/pt-eval.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,9 +27,8 @@ #include <cctype> #include <iostream> - -#include <fstream> -#include <typeinfo> +#include <list> +#include <string> #include "cmd-edit.h" #include "file-ops.h"
--- a/libinterp/parse-tree/pt-exp.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-exp.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,6 @@ # include "config.h" #endif -#include <iostream> #include <string> #include "error.h"
--- a/libinterp/parse-tree/pt-fcn-handle.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-fcn-handle.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "interpreter-private.h" #include "pt-fcn-handle.h"
--- a/libinterp/parse-tree/pt-jit.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-jit.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,9 +29,8 @@ # include "config.h" #endif +#include <sstream> #include <string> -#include <sstream> -#include <iostream> #include "bp-table.h" #include "defun.h"
--- a/libinterp/parse-tree/pt-pr-code.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-pr-code.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,8 +26,6 @@ #include <cctype> -#include <iostream> - #include "comment-list.h" #include "error.h" #include "ov-usr-fcn.h"
--- a/libinterp/parse-tree/pt-tm-const.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt-tm-const.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,8 +24,6 @@ # include "config.h" #endif -#include <iostream> - #include "oct-locbuf.h" #include "quit.h"
--- a/libinterp/parse-tree/pt.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/libinterp/parse-tree/pt.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,6 @@ # include "config.h" #endif -#include <iostream> #include <sstream> #include <string>
--- a/liboctave/array/Array.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/Array.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,7 @@ // C++ source files that should have included config.h before including // this file. -#include <iostream> +#include <ostream> #include "Array-util.h" #include "Array.h"
--- a/liboctave/array/CColVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CColVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/CDiagMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CDiagMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "Array-util.h" #include "lo-error.h"
--- a/liboctave/array/CMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -28,8 +28,9 @@ #include <algorithm> #include <complex> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "CDiagMatrix.h"
--- a/liboctave/array/CNDArray.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CNDArray.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,8 @@ #endif #include <complex> -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "CNDArray.h"
--- a/liboctave/array/CRowVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CRowVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/CSparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/CSparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,8 @@ #endif #include <complex> -#include <iostream> +#include <istream> +#include <ostream> #include "quit.h" #include "lo-ieee.h"
--- a/liboctave/array/DiagArray2.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/DiagArray2.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,8 +27,6 @@ #include <cassert> -#include <iostream> - #include <algorithm> #include "DiagArray2.h"
--- a/liboctave/array/MArray.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/MArray.cc Thu Jun 07 10:11:54 2018 -0400 @@ -134,8 +134,6 @@ vals.data ())); } -#include <iostream> - template <typename T> void MArray<T>::idx_add_nd (const idx_vector& idx, const MArray<T>& vals, int dim)
--- a/liboctave/array/Range.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/Range.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,8 +26,9 @@ #include <cmath> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "Range.h"
--- a/liboctave/array/Sparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/Sparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -29,8 +29,8 @@ #include <cassert> #include <algorithm> -#include <iostream> -#include <limits> +#include <istream> +#include <ostream> #include <sstream> #include <vector>
--- a/liboctave/array/boolMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/boolMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "Array-util.h" #include "boolMatrix.h"
--- a/liboctave/array/boolSparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/boolSparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include <vector> #include "quit.h"
--- a/liboctave/array/chMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/chMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,7 @@ #include <cstring> -#include <iostream> +#include <ostream> #include <string> #include "lo-error.h"
--- a/liboctave/array/dColVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dColVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/dDiagMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dDiagMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "Array-util.h" #include "lo-error.h"
--- a/liboctave/array/dMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,8 +27,9 @@ #endif #include <algorithm> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "CColVector.h"
--- a/liboctave/array/dNDArray.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dNDArray.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "dNDArray.h"
--- a/liboctave/array/dRowVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dRowVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/dSparse.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/dSparse.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "quit.h" #include "lo-ieee.h"
--- a/liboctave/array/fCColVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fCColVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/fCDiagMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fCDiagMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "Array-util.h" #include "lo-error.h"
--- a/liboctave/array/fCMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fCMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -28,8 +28,9 @@ #include <algorithm> #include <complex> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "DET.h"
--- a/liboctave/array/fCNDArray.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fCNDArray.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,8 @@ #endif #include <complex> -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "f77-fcn.h"
--- a/liboctave/array/fCRowVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fCRowVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/fColVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fColVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/fDiagMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fDiagMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include "Array-util.h" #include "lo-error.h"
--- a/liboctave/array/fMatrix.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fMatrix.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,8 +27,9 @@ #endif #include <algorithm> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "DET.h"
--- a/liboctave/array/fNDArray.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fNDArray.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,9 @@ # include "config.h" #endif -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include "Array-util.h" #include "f77-fcn.h"
--- a/liboctave/array/fRowVector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/fRowVector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -24,7 +24,8 @@ # include "config.h" #endif -#include <iostream> +#include <istream> +#include <ostream> #include "Array-util.h" #include "functor.h"
--- a/liboctave/array/idx-vector.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/array/idx-vector.cc Thu Jun 07 10:11:54 2018 -0400 @@ -28,7 +28,7 @@ #include <cstdlib> -#include <iostream> +#include <ostream> #include "idx-vector.h" #include "Array.h"
--- a/liboctave/numeric/CollocWt.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/numeric/CollocWt.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,8 +27,8 @@ #include <cassert> #include <cmath> -#include <iostream> #include <limits> +#include <ostream> #include "Array.h" #include "CollocWt.h"
--- a/liboctave/numeric/eigs-base.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/numeric/eigs-base.cc Thu Jun 07 10:11:54 2018 -0400 @@ -25,7 +25,8 @@ #endif #include <cmath> -#include <iostream> + +#include <ostream> #include "Array.h" #include "CSparse.h"
--- a/liboctave/system/file-ops.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/system/file-ops.cc Thu Jun 07 10:11:54 2018 -0400 @@ -33,7 +33,6 @@ # include <algorithm> #endif -#include <iostream> #include <vector> #include "areadlink-wrapper.h"
--- a/liboctave/system/oct-time.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/system/oct-time.cc Thu Jun 07 10:11:54 2018 -0400 @@ -28,8 +28,8 @@ #include <ctime> #include <iomanip> -#include <iostream> #include <limits> +#include <ostream> #include "lo-error.h" #include "lo-utils.h"
--- a/liboctave/util/cmd-hist.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/cmd-hist.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,6 @@ #include <cstring> #include <fstream> -#include <iostream> #include <sstream> #include <string>
--- a/liboctave/util/data-conv.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/data-conv.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,8 +27,9 @@ #include <cctype> #include <cstdlib> -#include <iostream> +#include <istream> #include <limits> +#include <ostream> #include <vector> #include "byte-swap.h"
--- a/liboctave/util/data-conv.h Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/data-conv.h Thu Jun 07 10:11:54 2018 -0400 @@ -25,8 +25,6 @@ #include "octave-config.h" -#include <limits> - #include "mach-info.h" #include "oct-inttypes-fwd.h"
--- a/liboctave/util/file-info.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/file-info.cc Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,6 @@ #include <deque> #include <fstream> -#include <iostream> #include "file-info.h" #include "file-stat.h"
--- a/liboctave/util/lo-utils.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/lo-utils.cc Thu Jun 07 10:11:54 2018 -0400 @@ -28,7 +28,9 @@ #include <cstring> #include <complex> +#include <istream> #include <limits> +#include <ostream> #include <string> #include "quit.h"
--- a/liboctave/util/lo-utils.h Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/lo-utils.h Thu Jun 07 10:11:54 2018 -0400 @@ -27,7 +27,7 @@ #include <cstdio> -#include <iostream> +#include <iosfwd> #include <string> #include "lo-cutils.h"
--- a/liboctave/util/quit.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/quit.cc Thu Jun 07 10:11:54 2018 -0400 @@ -26,7 +26,6 @@ #include <cstring> -#include <iostream> #include <new> #include "quit.h"
--- a/liboctave/util/str-vec.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/str-vec.cc Thu Jun 07 10:11:54 2018 -0400 @@ -32,7 +32,7 @@ # include "config.h" #endif -#include <iostream> +#include <ostream> #include <string> #include "cmd-edit.h"
--- a/liboctave/util/url-transfer.cc Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/url-transfer.cc Thu Jun 07 10:11:54 2018 -0400 @@ -48,6 +48,25 @@ namespace octave { + base_url_transfer::base_url_transfer (void) + : host_or_url (), valid (false), ftp (false), + ascii_mode (false), ok (true), errmsg (), + curr_istream (&std::cin), curr_ostream (&std::cout) { } + + base_url_transfer::base_url_transfer (const std::string& host, + const std::string& /* user_arg */, + const std::string& /* passwd */, + std::ostream& os) + : host_or_url (host), valid (false), ftp (true), + ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin), + curr_ostream (&os) { } + + base_url_transfer::base_url_transfer (const std::string& url, + std::ostream& os) + : host_or_url (url), valid (false), ftp (false), + ascii_mode (false), ok (true), errmsg (), + curr_istream (&std::cin), curr_ostream (&os) { } + void base_url_transfer::delete_file (const std::string& file) {
--- a/liboctave/util/url-transfer.h Wed Jun 06 13:13:20 2018 -0400 +++ b/liboctave/util/url-transfer.h Thu Jun 07 10:11:54 2018 -0400 @@ -30,8 +30,9 @@ #include "octave-config.h" -#include <iosfwd> +#include <istream> #include <memory> +#include <ostream> #include <string> #include "str-vec.h" @@ -57,23 +58,14 @@ friend class url_transfer; - base_url_transfer (void) - : host_or_url (), valid (false), ftp (false), - ascii_mode (false), ok (true), errmsg (), - curr_istream (&std::cin), curr_ostream (&std::cout) { } + base_url_transfer (void); base_url_transfer (const std::string& host, const std::string& /* user_arg */, const std::string& /* passwd */, - std::ostream& os) - : host_or_url (host), valid (false), ftp (true), - ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin), - curr_ostream (&os) { } + std::ostream& os); - base_url_transfer (const std::string& url, std::ostream& os) - : host_or_url (url), valid (false), ftp (false), - ascii_mode (false), ok (true), errmsg (), - curr_istream (&std::cin), curr_ostream (&os) { } + base_url_transfer (const std::string& url, std::ostream& os); // No copying!