diff src/ls-oct-ascii.h @ 5765:7ba9ad1fec11

[project @ 2006-04-17 05:05:15 by jwe]
author jwe
date Mon, 17 Apr 2006 05:05:17 +0000
parents a9ac02e9fda5
children cdef72fcd206
line wrap: on
line diff
--- a/src/ls-oct-ascii.h
+++ b/src/ls-oct-ascii.h
@@ -26,9 +26,9 @@
 
 #include <cfloat>
 
+#include <sstream>
 #include <string>
 
-#include "lo-sstream.h"
 #include "str-vec.h"
 
 // Flag for cell elements
@@ -78,7 +78,7 @@
     {
       if (c == '%' || c == '#')
 	{
-	  OSSTREAM buf;
+	  std::ostringstream buf;
 
 	  while (is.get (c) && (c == ' ' || c == '\t' || c == '%' || c == '#'))
 	    ; // Skip whitespace and comment characters.
@@ -89,10 +89,8 @@
 	  while (is.get (c) && isalpha (c))
 	    buf << c;
 
-	  buf << OSSTREAM_ENDS;
-	  std::string tmp = OSSTREAM_STR (buf);
+	  std::string tmp = buf.str ();
 	  bool match = (tmp.compare (0, strlen (keyword), keyword) == 0);
-	  OSSTREAM_FREEZE (buf);
 
 	  if (match)
 	    {
@@ -137,7 +135,7 @@
     {
       if (c == '%' || c == '#')
 	{
-	  OSSTREAM buf;
+	  std::ostringstream buf;
 
 	  while (is.get (c) && (c == ' ' || c == '\t' || c == '%' || c == '#'))
 	    ; // Skip whitespace and comment characters.
@@ -148,9 +146,7 @@
 	  while (is.get (c) && isalpha (c))
 	    buf << c;
 
-	  buf << OSSTREAM_ENDS;
-	  std::string tmp = OSSTREAM_STR (buf);
-	  OSSTREAM_FREEZE (buf);
+	  std::string tmp = buf.str ();
 
 	  for (int i = 0; i < keywords.length (); i++)
 	    {