# HG changeset patch
# User jwe
# Date 949492331 0
# Node ID 096ad38d7ab543e157ddaa5f72ebf882d1dfc8a1
# Parent  a99cf9fc22fe453159af18c64d79c9f4ec39f8f1
[project @ 2000-02-02 11:52:05 by jwe]

diff -r a99cf9fc22fe -r 096ad38d7ab5 src/defaults.cc
--- a/src/defaults.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/defaults.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -233,7 +233,7 @@
   Vsite_defaults_file.append ("/octaverc");
 }
 
-string
+std::string
 maybe_add_default_load_path (const std::string& pathstring)
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/dynamic-ld.cc
--- a/src/dynamic-ld.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/dynamic-ld.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -308,7 +308,7 @@
   return (instance_ok ()) ? instance->do_remove (fcn_name, shl) : false;
 }
 
-string
+std:string
 octave_dynamic_loader::mangle_name (const std::string& name)
 {
 #if defined (CXX_PREPENDS_UNDERSCORE)
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/input.cc
--- a/src/input.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/input.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -156,7 +156,7 @@
     }
 }
 
-string
+std:string
 gnu_readline (const std::string& s, bool force_readline)
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/oct-hist.cc
--- a/src/oct-hist.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/oct-hist.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -105,7 +105,7 @@
   return size;
 }
 
-string
+std:string
 default_history_file (void)
 {
   std::string file;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/oct-stream.cc
--- a/src/oct-stream.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/oct-stream.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -877,7 +877,7 @@
 // Functions that are defined for all input streams (input streams
 // are those that define is).
 
-string
+std:string
 octave_base_stream::do_gets (int max_len, bool& err,
 			     bool strip_newline, const char *fcn)
 {
@@ -950,13 +950,13 @@
   return retval;
 }
 
-string
+std:string
 octave_base_stream::getl (int max_len, bool& err)
 {
   return do_gets (max_len, err, true, "fgetl");
 }
 
-string
+std:string
 octave_base_stream::gets (int max_len, bool& err)
 {
   return do_gets (max_len, err, false, "fgets");
@@ -2071,7 +2071,7 @@
   return retval;
 }
 
-string
+std:string
 printf_value_cache::string_value (void)
 {
   std::string retval;
@@ -2371,7 +2371,7 @@
 
 // Return current error message for this stream.
 
-string
+std:string
 octave_base_stream::error (bool clear_err, int& err_num)
 {
   err_num = fail ? -1 : 0;
@@ -2441,7 +2441,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::getl (int max_len, bool& err)
 {
   std::string retval;
@@ -2452,7 +2452,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::getl (const octave_value& tc_max_len, bool& err)
 {
   std::string retval;
@@ -2474,7 +2474,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::gets (int max_len, bool& err)
 {
   std::string retval;
@@ -2485,7 +2485,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::gets (const octave_value& tc_max_len, bool& err)
 {
   std::string retval;
@@ -2712,7 +2712,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::error (bool clear, int& err_num)
 {
   std::string retval;
@@ -2723,7 +2723,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::name (void) const
 {
   std::string retval;
@@ -2756,7 +2756,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream::mode_as_string (int mode)
 {
   std::string retval = "???";
@@ -2895,7 +2895,7 @@
   return (instance_ok ()) ? instance->do_get_info (fid) : string_vector ();
 }
 
-string
+std:string
 octave_stream_list::list_open_files (void)
 {
   return (instance_ok ()) ? instance->do_list_open_files () : std::string ();
@@ -3079,7 +3079,7 @@
   return retval;
 }
 
-string
+std:string
 octave_stream_list::do_list_open_files (void) const
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/ov-base.cc
--- a/src/ov-base.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/ov-base.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -247,7 +247,7 @@
   return retval;
 }
 
-string
+std:string
 octave_base_value::string_value (void) const
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/ov-dld-fcn.cc
--- a/src/ov-dld-fcn.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/ov-dld-fcn.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -62,7 +62,7 @@
   octave_dynamic_loader::remove (my_name, sh_lib);
 }
 
-string
+std:string
 octave_dld_function::fcn_file_name (void) const
 {
   return sh_lib.file_name ();
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/ov-str-mat.cc
--- a/src/ov-str-mat.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/ov-str-mat.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -182,7 +182,7 @@
   return retval;
 }
 
-string
+std:string
 octave_char_matrix_str::string_value (void) const
 {
   return matrix.row_as_string (0);  // XXX FIXME??? XXX
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/ov.cc
--- a/src/ov.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/ov.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -121,7 +121,7 @@
 
 // Octave's value type.
 
-string
+std:string
 octave_value::unary_op_as_string (unary_op op)
 {
   std::string retval;
@@ -159,7 +159,7 @@
   return retval;
 }
 
-string
+std:string
 octave_value::binary_op_as_string (binary_op op)
 {
   std::string retval;
@@ -257,7 +257,7 @@
   return retval;
 }
 
-string
+std:string
 octave_value::assign_op_as_string (assign_op op)
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/parse.y
--- a/src/parse.y	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/parse.y	Wed Feb 02 11:52:11 2000 +0000
@@ -2903,7 +2903,7 @@
   return help_txt;
 }
 
-string
+std:string
 get_help_from_file (const std::string& path)
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-assign.cc
--- a/src/pt-assign.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-assign.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -160,7 +160,7 @@
     }
 }
 
-string
+std:string
 tree_simple_assignment::oper (void) const
 {
   return octave_value::assign_op_as_string (etype);
@@ -309,7 +309,7 @@
     }
 }
 
-string
+std:string
 tree_multi_assignment::oper (void) const
 {
   return octave_value::assign_op_as_string (etype);
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-binop.cc
--- a/src/pt-binop.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-binop.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -100,7 +100,7 @@
 	     oper () . c_str (), line (), column ());
 }
 
-string
+std:string
 tree_binary_expression::oper (void) const
 {
   return octave_value::binary_op_as_string (etype);
@@ -196,7 +196,7 @@
   return retval;
 }
 
-string
+std:string
 tree_boolean_expression::oper (void) const
 {
   std::string retval = "<unknown>";
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-exp.cc
--- a/src/pt-exp.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-exp.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -82,7 +82,7 @@
   return octave_lvalue ();
 }
 
-string
+std:string
 tree_expression::original_text (void) const
 {
   return std::string ();
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-id.cc
--- a/src/pt-id.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-id.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -41,7 +41,7 @@
 
 // Symbols from the symbol table.
 
-string
+std:string
 tree_identifier::name (void) const
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-idx.cc
--- a/src/pt-idx.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-idx.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -53,7 +53,7 @@
 // This is useful for printing the name of the variable in an indexed
 // assignment.
 
-string
+std:string
 tree_index_expression::name (void) const
 {
   return expr->name ();
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-indir.cc
--- a/src/pt-indir.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-indir.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -46,7 +46,7 @@
   delete expr;
 }
 
-string
+std:string
 tree_indirect_ref::name (void) const
 {
   // ??? FIXME ???
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-plot.cc
--- a/src/pt-plot.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-plot.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -855,7 +855,7 @@
   tw.visit_subplot_list (*this);
 }
 
-string
+std:string
 save_in_tmp_file (octave_value& t, int ndim, bool parametric)
 {
   std::string name = file_ops::tempnam ("", "oct-");
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt-unop.cc
--- a/src/pt-unop.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt-unop.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -37,7 +37,7 @@
 
 // Unary expressions.
 
-string
+std:string
 tree_unary_expression::oper (void) const
 {
   return octave_value::unary_op_as_string (etype);
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/pt.cc
--- a/src/pt.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/pt.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -38,7 +38,7 @@
 // Hide the details of the string buffer so that we are less likely to
 // create a memory leak.
 
-string
+std:string
 tree::str_print_code (void)
 {
   std::ostrstream buf;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/symtab.cc
--- a/src/symtab.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/symtab.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -58,7 +58,7 @@
 
 #define SYMBOL_DEF symbol_record::symbol_def
 
-string
+std:string
 SYMBOL_DEF::type_as_string (void) const
 {
   std::string retval = "<unknown type>";
@@ -137,7 +137,7 @@
     os << name << " is a " << type_as_string () << "\n";
 }
 
-string
+std:string
 SYMBOL_DEF::which (const std::string& name)
 {
   std::string retval;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/token.cc
--- a/src/token.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/token.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -90,7 +90,7 @@
     delete str;
 }
 
-string
+std:string
 token::text (void)
 {
   assert (type_tag == string_token);
@@ -125,7 +125,7 @@
   return sr;
 }
 
-string
+std:string
 token::text_rep (void)
 {
   return orig_text;
diff -r a99cf9fc22fe -r 096ad38d7ab5 src/utils.cc
--- a/src/utils.cc	Wed Feb 02 11:45:24 2000 +0000
+++ b/src/utils.cc	Wed Feb 02 11:52:11 2000 +0000
@@ -228,7 +228,7 @@
 
 // See if the given file is in the path.
 
-string
+std:string
 search_path_for_file (const std::string& path, const std::string& name)
 {
   dir_path p (path);
@@ -303,7 +303,7 @@
   return retval;
 }
 
-string
+std:string
 file_in_path (const std::string& name, const std::string& suffix)
 {
   std::string nm = name;
@@ -318,7 +318,7 @@
 // See if there is an function file in the path.  If so, return the
 // full path to the file.
 
-string
+std:string
 fcn_file_in_path (const std::string& name)
 {
   std::string retval;
@@ -339,7 +339,7 @@
 // See if there is an octave file in the path.  If so, return the
 // full path to the file.
 
-string
+std:string
 oct_file_in_path (const std::string& name)
 {
   std::string retval;
@@ -360,7 +360,7 @@
 
 // Replace backslash escapes in a string with the real values.
 
-string
+std:string
 do_string_escapes (const std::string& s)
 {
   std::string retval;
@@ -506,7 +506,7 @@
     }
 }
 
-string
+std:string
 undo_string_escapes (const std::string& s)
 {
   std::string retval;