--- a/src/load-save.cc	Sun Apr 16 19:10:01 2006 +0000
+++ b/src/load-save.cc	Mon Apr 17 05:05:17 2006 +0000
@@ -36,6 +36,7 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <sstream>
 #include <string>
 
 #ifdef HAVE_HDF5
@@ -47,7 +48,6 @@
 #include "file-ops.h"
 #include "glob-match.h"
 #include "lo-mappers.h"
-#include "lo-sstream.h"
 #include "mach-info.h"
 #include "oct-env.h"
 #include "oct-time.h"
@@ -444,7 +444,7 @@
 
   Octave_map retstruct;
 
-  OSSTREAM output_buf;
+  std::ostringstream output_buf;
 
   octave_idx_type count = 0;
 
@@ -560,9 +560,7 @@
 
   if (list_only && count)
     {
-      output_buf << OSSTREAM_ENDS;
-      std::string msg = OSSTREAM_STR (output_buf);
-      OSSTREAM_FREEZE (output_buf);
+      std::string msg = output_buf.str ();
 
       if (nargout > 0)
 	retval = msg;
@@ -1183,12 +1181,12 @@
 		    bool &append, bool &save_as_floats, 
 		    bool &save_builtins, bool &use_zlib, int start_arg)
 {
-  ISSTREAM is (arg);
+  std::istringstream is (arg);
   std::string str;
   int argc = 0;
   string_vector argv;
   
-  while (!is.eof ())
+  while (! is.eof ())
     {
       is >> str;
       argv.append (str);