commit a95d3750441ac8ad03e36af8e6e74039c9a3109d
author Ted Kremenek <kremenek@apple.com> Sat Sep 13 05:16:45 2008 +0000
committer Ted Kremenek <kremenek@apple.com> Sat Sep 13 05:16:45 2008 +0000
tree ff6594ca38fba0ebad2d5a63583a909bdfb72a9f
parent 635d04fe2a14fe79ac9b3802b66f6314ca8bc539

Patch by Csaba Hruska!

"Here is a patch what replaces std::ostream with llvm::raw_ostream. This patch
covers the AST library, but ignores Analysis lib."


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56185 91177308-0d34-0410-b5e6-96231b3b80d8

Driver/RewriteObjC.cpp

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index bd809be..1ec83bf 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -22,12 +22,12 @@
 #include "clang/Lex/Lexer.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Streams.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/System/Path.h"
-#include <sstream>
-#include <fstream>
 using namespace clang;
 using llvm::utostr;
 
@@ -453,20 +453,23 @@
 
   // Create the output file.
   
-  std::ostream *OutFile;
+  llvm::OwningPtr<llvm::raw_ostream> OwnedStream;
+  llvm::raw_ostream *OutFile;
   if (OutFileName == "-") {
-    OutFile = llvm::cout.stream();
+    OutFile = &llvm::outs();
   } else if (!OutFileName.empty()) {
-    OutFile = new std::ofstream(OutFileName.c_str(), 
-                                std::ios_base::binary|std::ios_base::out);
+    std::string Err;
+    OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(), Err);
+    OwnedStream.reset(OutFile);
   } else if (InFileName == "-") {
-    OutFile = llvm::cout.stream();
+    OutFile = &llvm::outs();
   } else {
     llvm::sys::Path Path(InFileName);
     Path.eraseSuffix();
     Path.appendSuffix("cpp");
-    OutFile = new std::ofstream(Path.toString().c_str(), 
-                                std::ios_base::binary|std::ios_base::out);
+    std::string Err;
+    OutFile = new llvm::raw_fd_ostream(Path.toString().c_str(), Err);
+    OwnedStream.reset(OutFile);
   }
   
   RewriteInclude();
@@ -489,6 +492,7 @@
   }
   // Emit metadata.
   *OutFile << ResultStr;
+  OutFile->flush();
 }
 
 //===----------------------------------------------------------------------===//
@@ -1040,7 +1044,8 @@
   if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(S)) {
     CastExpr *Replacement = new CastExpr(ICE->getType(), ICE->getSubExpr(), SourceLocation());
     // Get the new text.
-    std::ostringstream Buf;
+    std::string SStr;
+    llvm::raw_string_ostream Buf(SStr);
     Replacement->printPretty(Buf);
     const std::string &Str = Buf.str();
 
@@ -1333,7 +1338,8 @@
   buf += "  objc_sync_exit(";
   Expr *syncExpr = new ExplicitCastExpr(Context->getObjCIdType(), 
                                         S->getSynchExpr(), SourceLocation());
-  std::ostringstream syncExprBuf;
+  std::string syncExprBufS;
+  llvm::raw_string_ostream syncExprBuf(syncExprBufS);
   syncExpr->printPretty(syncExprBuf);
   buf += syncExprBuf.str();
   buf += ");\n";
@@ -1942,7 +1948,8 @@
   Preamble += " __attribute__ ((section (\"__DATA, __cfstring\"))) = {__CFConstantStringClassReference,";
   Preamble += "0x000007c8,"; // utf8_str
   // The pretty printer for StringLiteral handles escape characters properly.
-  std::ostringstream prettyBuf;
+  std::string prettyBufS;
+  llvm::raw_string_ostream prettyBuf(prettyBufS);
   Exp->getString()->printPretty(prettyBuf);
   Preamble += prettyBuf.str();
   Preamble += ",";