diff liboctave/data-conv.cc @ 3504:5eef8a2294bd

[project @ 2000-02-01 10:06:51 by jwe]
author jwe
date Tue, 01 Feb 2000 10:07:26 +0000
parents d14c483b3c12
children ef5c83d6bffc
line wrap: on
line diff
--- a/liboctave/data-conv.cc
+++ b/liboctave/data-conv.cc
@@ -102,7 +102,7 @@
 }
 
 oct_data_conv::data_type
-oct_data_conv::string_to_data_type (const string& str)
+oct_data_conv::string_to_data_type (const std::string& str)
 {
   data_type retval = dt_unknown;
 
@@ -123,7 +123,7 @@
 
   int k = 0;
 
-  string s (n, ' ');
+  std::string s (n, ' ');
 
   for (int i = 0; i < n; i++)
     if (! isspace (str[i]))
@@ -685,7 +685,7 @@
 }
 
 void
-read_doubles (istream& is, double *data, save_type type, int len,
+read_doubles (std::istream& is, double *data, save_type type, int len,
 	      int swap, oct_mach_info::float_format fmt)
 {
   switch (type)
@@ -732,13 +732,13 @@
       break;
 
     default:
-      is.clear (ios::failbit|is.rdstate ());
+      is.clear (std::ios::failbit|is.rdstate ());
       break;
     }
 }
 
 void
-write_doubles (ostream& os, const double *data, save_type type, int len)
+write_doubles (std::ostream& os, const double *data, save_type type, int len)
 {
   switch (type)
     {