Merge topic 'drop-ancient-workarounds'

0f7bdd61 Remove VS 6 special case.
5e92c826 Remove some obsolete stuff.
15e42bb2 cmStandardIncludes: Remove obsolete cmOStringStream.
931e055d Port all cmOStringStream to std::ostringstream.
f194a009 Remove unused cmIStringStream class.
3ec1bb15 cmStandardIncludes: Remove std namespace hack.
bb3bce70 cmStandardIncludes: Remove ANSI_FOR_SCOPE hack.
28fa4923 cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler.
837a8a63 cmStandardIncludes: Drop Comeau-related workaround.
4030ddfd Remove Borland-related undef.
17d6a6fd cmStandardIncludes: Remove comment about Borland.
26fb5011 Drop SGI as a CMake host compiler.

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 1c39563..3e26349 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -68,7 +68,7 @@ bool cmListFileParser::ParseFile()
      bom != cmListFileLexer_BOM_UTF8)
     {
     cmListFileLexer_SetFileName(this->Lexer, 0, 0);
-    cmOStringStream m;
+    std::ostringstream m;
     m << "File\n  " << this->FileName << "\n"
       << "starts with a Byte-Order-Mark that is not UTF-8.";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, m.str());
@@ -108,7 +108,7 @@ bool cmListFileParser::ParseFile()
         }
       else
         {
-        cmOStringStream error;
+        std::ostringstream error;
         error << "Error in cmake code at\n"
               << this->FileName << ":" << token->line << ":\n"
               << "Parse error.  Expected a newline, got "
@@ -120,7 +120,7 @@ bool cmListFileParser::ParseFile()
       }
     else
       {
-      cmOStringStream error;
+      std::ostringstream error;
       error << "Error in cmake code at\n"
             << this->FileName << ":" << token->line << ":\n"
             << "Parse error.  Expected a command name, got "
@@ -268,7 +268,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
         token->type == cmListFileLexer_Token_Space) {}
   if(!token)
     {
-    cmOStringStream error;
+    std::ostringstream error;
     error << "Error in cmake code at\n" << this->FileName << ":"
           << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
           << "Parse error.  Function missing opening \"(\".";
@@ -277,7 +277,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
     }
   if(token->type != cmListFileLexer_Token_ParenLeft)
     {
-    cmOStringStream error;
+    std::ostringstream error;
     error << "Error in cmake code at\n" << this->FileName << ":"
           << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
           << "Parse error.  Expected \"(\", got "
@@ -355,7 +355,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
     else
       {
       // Error.
-      cmOStringStream error;
+      std::ostringstream error;
       error << "Error in cmake code at\n" << this->FileName << ":"
             << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n"
             << "Parse error.  Function missing ending \")\".  "
@@ -367,7 +367,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
       }
     }
 
-  cmOStringStream error;
+  std::ostringstream error;
   error << "Error in cmake code at\n"
         << this->FileName << ":" << lastLine << ":\n"
         << "Parse error.  Function missing ending \")\".  "
@@ -389,7 +389,7 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token* token,
     }
   bool isError = (this->Separation == SeparationError ||
                   delim == cmListFileArgument::Bracket);
-  cmOStringStream m;
+  std::ostringstream m;
   m << "Syntax " << (isError? "Error":"Warning") << " in cmake code at\n"
     << "  " << this->FileName << ":" << token->line << ":"
     << token->column << "\n"