Mercurial > hg > octave-nkf
changeset 4055:7690958e7726
[project @ 2002-08-18 01:56:58 by jwe]
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2002-08-17 Mumit Khan <khan@nanotech.wisc.edu> + + * CmplxCHOL.h, CollocWt.h, cmd-edit.h, oct-shlib.h: Don't use + qualified names. + 2002-08-17 John W. Eaton <jwe@bevo.che.wisc.edu> * Array.h, Array2-idx.h, DiagArray2.cc, Array2.cc, Array3.cc,
--- a/liboctave/CmplxCHOL.h +++ b/liboctave/CmplxCHOL.h @@ -38,17 +38,17 @@ ComplexCHOL (void) : chol_mat () { } - ComplexCHOL::ComplexCHOL (const ComplexMatrix& a) { init (a); } + ComplexCHOL (const ComplexMatrix& a) { init (a); } - ComplexCHOL::ComplexCHOL (const ComplexMatrix& a, int& info) + ComplexCHOL (const ComplexMatrix& a, int& info) { info = init (a); } - ComplexCHOL::ComplexCHOL (const ComplexCHOL& a) + ComplexCHOL (const ComplexCHOL& a) : chol_mat (a.chol_mat) { } - ComplexCHOL& ComplexCHOL::operator = (const ComplexCHOL& a) + ComplexCHOL& operator = (const ComplexCHOL& a) { if (this != &a) chol_mat = a.chol_mat; @@ -56,7 +56,7 @@ return *this; } - ComplexMatrix ComplexCHOL::chol_matrix (void) const + ComplexMatrix chol_matrix (void) const { return chol_mat; }
--- a/liboctave/CollocWt.h +++ b/liboctave/CollocWt.h @@ -37,35 +37,34 @@ { public: - CollocWt::CollocWt (void) + CollocWt (void) : n (0), inc_left (0), inc_right (0), lb (0.0), rb (1.0), Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { } - CollocWt::CollocWt (int nc, int il, int ir) + CollocWt (int nc, int il, int ir) : n (nc), inc_left (il), inc_right (ir), lb (0.0), rb (1.0), Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { } - CollocWt::CollocWt (int nc, int il, int ir, double l, double r) + CollocWt (int nc, int il, int ir, double l, double r) : n (nc), inc_left (il), inc_right (ir), lb (l), rb (r), Alpha (0.0), Beta (0.0), r (), q (), A (), B (), initialized (0) { } - CollocWt::CollocWt (int nc, double a, double b, int il, int ir) + CollocWt (int nc, double a, double b, int il, int ir) : n (nc), inc_left (il), inc_right (ir), lb (0.0), rb (1.0), Alpha (a), Beta (b), initialized (0) { } - CollocWt::CollocWt (int nc, double a, double b, int il, int ir, + CollocWt (int nc, double a, double b, int il, int ir, double l, double r) : n (nc), inc_left (il), inc_right (ir), lb (l), rb (r), Alpha (a), Beta (b), r (), q (), A (), B (), initialized (0) { } - CollocWt::CollocWt (const CollocWt& a) + CollocWt (const CollocWt& a) : n (a.n), inc_left (a.inc_left), inc_right (a.inc_right), lb (a.lb), rb (a.rb), Alpha (a.Alpha), Beta (a.Beta), r (a.r), q (a.q), A (a.A), B (a.B), initialized (a.initialized) { } - CollocWt& - CollocWt::operator = (const CollocWt& a) + CollocWt& operator = (const CollocWt& a) { if (this != &a) {
--- a/liboctave/cmd-edit.h +++ b/liboctave/cmd-edit.h @@ -73,11 +73,9 @@ static void blink_matching_paren (bool flag); - static void command_editor::set_basic_word_break_characters - (const std::string& s); + static void set_basic_word_break_characters (const std::string& s); - static void command_editor::set_completer_word_break_characters - (const std::string& s); + static void set_completer_word_break_characters (const std::string& s); static void set_basic_quote_characters (const std::string& s);
--- a/liboctave/oct-shlib.h +++ b/liboctave/oct-shlib.h @@ -49,7 +49,7 @@ octave_shlib (void) : rep (make_shlib ()) { } - octave_shlib::octave_shlib (const std::string& f, bool warn_future) + octave_shlib (const std::string& f, bool warn_future) : rep (make_shlib ()) { open (f, warn_future);
--- a/src/Cell.h +++ b/src/Cell.h @@ -33,7 +33,7 @@ #include "oct-alloc.h" #include "str-vec.h" -#include "ov.h" +#include "oct-obj.h" class Cell : public Array2<octave_value>
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,28 @@ +2002-08-17 Mumit Khan <khan@nanotech.wisc.edu> + + * c-file-ptr-stream.h (c_file_ptr_buf::c_file_ptr_buf): Add Intel + C++ runtime support. + + * Cell.h, gripes.cc, ov-base-scalar.cc, ov-colon.cc, ov-fcn.cc, + ov-file.cc, ov-mapper.h, ov-va-args.cc, token.cc, xpow.cc, + OPERATORS/op-b-b.cc, OPERATORS/op-bm-b.cc, OPERATORS/op-bm-bm.cc, + OPERATORS/op-cell.cc, OPERATORS/op-chm.cc, OPERATORS/op-cm-cm.cc, + OPERATORS/op-cm-cs.cc, OPERATORS/op-cm-m.cc, OPERATORS/op-cm-s.cc, + OPERATORS/op-cs-cm.cc, OPERATORS/op-cs-cs.cc, OPERATORS/op-cs-m.cc, + OPERATORS/op-cs-s.cc, OPERATORS/op-fil-b.cc, OPERATORS/op-fil-bm.cc, + OPERATORS/op-fil-cm.cc, OPERATORS/op-fil-cs.cc, + OPERATORS/op-fil-lis.cc, OPERATORS/op-fil-m.cc, + OPERATORS/op-fil-rec.cc, OPERATORS/op-fil-s.cc, + OPERATORS/op-fil-str.cc, OPERATORS/op-list.cc, OPERATORS/op-m-cm.cc, + OPERATORS/op-m-cs.cc, OPERATORS/op-m-m.cc, OPERATORS/op-m-s.cc, + OPERATORS/op-range.cc, OPERATORS/op-s-cm.cc, OPERATORS/op-s-cs.cc, + OPERATORS/op-s-m.cc, OPERATORS/op-s-s.cc, OPERATORS/op-str-str.cc, + TEMPLATE-INST/Array-sym.cc, TEMPLATE-INST/Array-tc.cc, + TEMPLATE-INST/Map-tc.cc, TEMPLATE-INST/SLList-expr.cc, + TEMPLATE-INST/SLList-tc.cc, TEMPLATE-INST/SLList-tm.cc, + TEMPLATE-INST/SLStack-sym.cc: Make the implementation of + octave_value_list visibile for template instantiation. + 2002-08-17 John W. Eaton <jwe@bevo.che.wisc.edu> * DLD-FUNCTIONS/dasrt.cc: Include <iostream> not <iostream.h>.
--- a/src/OPERATORS/op-b-b.cc +++ b/src/OPERATORS/op-b-b.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-bool.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-bm-b.cc +++ b/src/OPERATORS/op-bm-b.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-bool.h" #include "ov-bool-mat.h"
--- a/src/OPERATORS/op-bm-bm.cc +++ b/src/OPERATORS/op-bm-bm.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-bool-mat.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-cell.cc +++ b/src/OPERATORS/op-cell.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-cell.h" #include "ov-scalar.h"
--- a/src/OPERATORS/op-chm.cc +++ b/src/OPERATORS/op-chm.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-ch-mat.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-cm-cm.cc +++ b/src/OPERATORS/op-cm-cm.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-cx-mat.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-cm-cs.cc +++ b/src/OPERATORS/op-cm-cs.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-cx-mat.h" #include "ov-complex.h"
--- a/src/OPERATORS/op-cm-m.cc +++ b/src/OPERATORS/op-cm-m.cc @@ -32,6 +32,7 @@ #include "mx-m-cm.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-cx-mat.h" #include "ov-re-mat.h"
--- a/src/OPERATORS/op-cm-s.cc +++ b/src/OPERATORS/op-cm-s.cc @@ -31,6 +31,7 @@ #include "mx-cm-s.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-cx-mat.h" #include "ov-re-mat.h"
--- a/src/OPERATORS/op-cs-cm.cc +++ b/src/OPERATORS/op-cs-cm.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-complex.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-cs-cs.cc +++ b/src/OPERATORS/op-cs-cs.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-complex.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-cs-m.cc +++ b/src/OPERATORS/op-cs-m.cc @@ -32,6 +32,7 @@ #include "mx-m-cs.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-complex.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-cs-s.cc +++ b/src/OPERATORS/op-cs-s.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-complex.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-fil-b.cc +++ b/src/OPERATORS/op-fil-b.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-bm.cc +++ b/src/OPERATORS/op-fil-bm.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-cm.cc +++ b/src/OPERATORS/op-fil-cm.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-cs.cc +++ b/src/OPERATORS/op-fil-cs.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-lis.cc +++ b/src/OPERATORS/op-fil-lis.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-m.cc +++ b/src/OPERATORS/op-fil-m.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-rec.cc +++ b/src/OPERATORS/op-fil-rec.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-s.cc +++ b/src/OPERATORS/op-fil-s.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-fil-str.cc +++ b/src/OPERATORS/op-fil-str.cc @@ -33,6 +33,7 @@ #include "mach-info.h" #include "error.h" +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov.h"
--- a/src/OPERATORS/op-list.cc +++ b/src/OPERATORS/op-list.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-list.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-m-cm.cc +++ b/src/OPERATORS/op-m-cm.cc @@ -32,6 +32,7 @@ #include "mx-cm-m.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-m-cs.cc +++ b/src/OPERATORS/op-m-cs.cc @@ -32,6 +32,7 @@ #include "mx-cs-m.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-m-m.cc +++ b/src/OPERATORS/op-m-m.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-m-s.cc +++ b/src/OPERATORS/op-m-s.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-scalar.h"
--- a/src/OPERATORS/op-range.cc +++ b/src/OPERATORS/op-range.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-range.h" #include "ov-typeinfo.h"
--- a/src/OPERATORS/op-s-cm.cc +++ b/src/OPERATORS/op-s-cm.cc @@ -32,6 +32,7 @@ #include "mx-cm-s.h" #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-scalar.h" #include "ov-cx-mat.h"
--- a/src/OPERATORS/op-s-cs.cc +++ b/src/OPERATORS/op-s-cs.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-scalar.h" #include "ov-complex.h"
--- a/src/OPERATORS/op-s-m.cc +++ b/src/OPERATORS/op-s-m.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-scalar.h" #include "ov-re-mat.h"
--- a/src/OPERATORS/op-s-s.cc +++ b/src/OPERATORS/op-s-s.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-scalar.h" #include "ov-re-mat.h"
--- a/src/OPERATORS/op-str-str.cc +++ b/src/OPERATORS/op-str-str.cc @@ -29,6 +29,7 @@ #endif #include "gripes.h" +#include "oct-obj.h" #include "ov.h" #include "ov-str-mat.h" #include "ov-typeinfo.h"
--- a/src/TEMPLATE-INST/Array-sym.cc +++ b/src/TEMPLATE-INST/Array-sym.cc @@ -29,6 +29,7 @@ #include "Array.h" #include "Array.cc" +#include "oct-obj.h" #include "symtab.h" template class Array<symbol_record *>;
--- a/src/TEMPLATE-INST/Array-tc.cc +++ b/src/TEMPLATE-INST/Array-tc.cc @@ -35,7 +35,7 @@ #include "DiagArray2.h" #include "DiagArray2.cc" -#include "ov.h" +#include "oct-obj.h" template class Array<octave_value>;
--- a/src/TEMPLATE-INST/Map-tc.cc +++ b/src/TEMPLATE-INST/Map-tc.cc @@ -29,7 +29,7 @@ #include "Map.h" #include "Map.cc" -#include "ov.h" +#include "oct-obj.h" template class Map<octave_value>; template class CHNode<octave_value>;
--- a/src/TEMPLATE-INST/SLList-expr.cc +++ b/src/TEMPLATE-INST/SLList-expr.cc @@ -29,7 +29,7 @@ #include "SLList.h" #include "SLList.cc" -#include "ov.h" +#include "oct-obj.h" #include "pt-exp.h" #include "pt-id.h" #include "pt-idx.h"
--- a/src/TEMPLATE-INST/SLList-tc.cc +++ b/src/TEMPLATE-INST/SLList-tc.cc @@ -29,7 +29,7 @@ #include "SLList.h" #include "SLList.cc" -#include "ov.h" +#include "oct-obj.h" template class SLNode<octave_value>; template class SLList<octave_value>;
--- a/src/TEMPLATE-INST/SLList-tm.cc +++ b/src/TEMPLATE-INST/SLList-tm.cc @@ -29,7 +29,7 @@ #include "SLList.h" #include "SLList.cc" -#include "ov.h" +#include "oct-obj.h" #include "pt-mat.h" template class SLNode<tree_matrix *>;
--- a/src/TEMPLATE-INST/SLStack-sym.cc +++ b/src/TEMPLATE-INST/SLStack-sym.cc @@ -35,6 +35,7 @@ #include "SLStack.h" #include "SLStack.cc" +#include "oct-obj.h" #include "symtab.h" template class SLNode<symbol_record::symbol_def *>;
--- a/src/c-file-ptr-stream.h +++ b/src/c-file-ptr-stream.h @@ -72,6 +72,8 @@ : #if defined __GNUC__ && __GNUC__ >= 3 OCTAVE_STD_FILEBUF (f_arg, std::ios::in | std::ios::out), +#elif defined __INTEL_COMPILER + OCTAVE_STD_FILEBUF (f_arg), #else OCTAVE_STD_FILEBUF (f_arg ? fileno (f_arg) : -1), #endif
--- a/src/gripes.cc +++ b/src/gripes.cc @@ -26,7 +26,7 @@ #include "error.h" #include "gripes.h" -#include "ov.h" +#include "oct-obj.h" void gripe_not_supported (const char *fcn)
--- a/src/ov-base-scalar.cc +++ b/src/ov-base-scalar.cc @@ -30,6 +30,7 @@ #include <iostream> +#include "oct-obj.h" #include "ov-base.h" #include "ov-cx-mat.h" #include "ov-re-mat.h"
--- a/src/ov-colon.cc +++ b/src/ov-colon.cc @@ -32,6 +32,7 @@ #include "error.h" #include "pr-output.h" +#include "oct-obj.h" #include "ov-colon.h" DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_magic_colon, "magic-colon");
--- a/src/ov-fcn.cc +++ b/src/ov-fcn.cc @@ -29,6 +29,7 @@ #endif #include "error.h" +#include "oct-obj.h" #include "ov-fcn.h" DEFINE_OCTAVE_ALLOCATOR (octave_function);
--- a/src/ov-file.cc +++ b/src/ov-file.cc @@ -30,6 +30,7 @@ #include <iostream> +#include "oct-obj.h" #include "oct-stream.h" #include "ops.h" #include "ov-file.h"
--- a/src/ov-mapper.h +++ b/src/ov-mapper.h @@ -29,6 +29,7 @@ #include <string> +#include "oct-obj.h" #include "ov-fcn.h" #include "ov-typeinfo.h"
--- a/src/ov-va-args.cc +++ b/src/ov-va-args.cc @@ -32,6 +32,7 @@ #include "error.h" #include "pr-output.h" +#include "oct-obj.h" #include "ov-va-args.h" DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_all_va_args, "va-arg");