Change uses of std::cerr/std::cout to llvm::Lcerr/llvm::cout, and remove
#include<iostream>.
Patch provided by Sam Bishop.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45962 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/TextDiagnosticPrinter.cpp b/Driver/TextDiagnosticPrinter.cpp
index 16b348f..bd98b91 100644
--- a/Driver/TextDiagnosticPrinter.cpp
+++ b/Driver/TextDiagnosticPrinter.cpp
@@ -18,7 +18,7 @@
#include "clang/Lex/Lexer.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/MemoryBuffer.h"
-#include <iostream>
+#include "llvm/Support/Streams.h"
#include <string>
using namespace clang;
@@ -40,8 +40,8 @@
PrintIncludeStack(Pos.getIncludeLoc());
unsigned LineNo = Pos.getLineNumber();
- std::cerr << "In file included from " << Pos.getSourceName()
- << ":" << LineNo << ":\n";
+ llvm::cerr << "In file included from " << Pos.getSourceName()
+ << ":" << LineNo << ":\n";
}
/// HighlightRange - Given a SourceRange and a line number, highlight (with ~'s)
@@ -141,23 +141,23 @@
*LineEnd != '\n' && *LineEnd != '\r')
++LineEnd;
- std::cerr << Buffer->getBufferIdentifier()
- << ":" << LineNo << ":";
+ llvm::cerr << Buffer->getBufferIdentifier()
+ << ":" << LineNo << ":";
if (ColNo && !NoShowColumn)
- std::cerr << ColNo << ":";
- std::cerr << " ";
+ llvm::cerr << ColNo << ":";
+ llvm::cerr << " ";
}
switch (Level) {
default: assert(0 && "Unknown diagnostic type!");
- case Diagnostic::Note: std::cerr << "note: "; break;
- case Diagnostic::Warning: std::cerr << "warning: "; break;
- case Diagnostic::Error: std::cerr << "error: "; break;
- case Diagnostic::Fatal: std::cerr << "fatal error: "; break;
+ case Diagnostic::Note: llvm::cerr << "note: "; break;
+ case Diagnostic::Warning: llvm::cerr << "warning: "; break;
+ case Diagnostic::Error: llvm::cerr << "error: "; break;
+ case Diagnostic::Fatal: llvm::cerr << "fatal error: "; break;
break;
}
- std::cerr << FormatDiagnostic(Diags, Level, ID, Strs, NumStrs) << "\n";
+ llvm::cerr << FormatDiagnostic(Diags, Level, ID, Strs, NumStrs) << "\n";
if (!NoCaretDiagnostics && Pos.isValid()) {
// Get the line of the source file.
@@ -202,7 +202,7 @@
CaratLine.erase(CaratLine.end()-1);
// Emit what we have computed.
- std::cerr << SourceLine << "\n";
- std::cerr << CaratLine << "\n";
+ llvm::cerr << SourceLine << "\n";
+ llvm::cerr << CaratLine << "\n";
}
}