From bcff69a1e0788377b8bec87f850a6f5977fe9d22 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 8 Apr 2013 08:30:47 +0000 Subject: [PATCH] Don't define our own global 'endl' variable. While technically it had internal linkage and so wasn't a patent bug, it doesn't make any sense here. We can avoid even calling operator<< by just embedding the newline in the string literals that were already being streamed out. It also gives the impression of some line-ending agnosticisms which is not present, and that flushing happens when it doesn't. If we want to use std::endl, we could do that, but honestly it doesn't seem remotely worth it. Using '\n' directly is much more clear when working with raw_ostream. It also happens to fix builds with old crufty GCC STL implementations that include std::endl into the global namespace (or headers written to be compatible with such atrocities). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179003 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/obj2yaml/obj2yaml.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/obj2yaml/obj2yaml.cpp b/tools/obj2yaml/obj2yaml.cpp index bdc461a9471..68701dea567 100644 --- a/tools/obj2yaml/obj2yaml.cpp +++ b/tools/obj2yaml/obj2yaml.cpp @@ -16,8 +16,6 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" -const char endl = '\n'; - namespace yaml { // generic yaml-writing specific routines unsigned char printable(unsigned char Ch) { @@ -37,7 +35,7 @@ llvm::raw_ostream &writeHexStream(llvm::raw_ostream &Out, Out << "\" # |"; for (iter_t iter = arr.begin(); iter != end; ++iter) Out << printable(*iter); - Out << "|" << endl; + Out << "|\n"; return Out; } @@ -75,11 +73,11 @@ int main(int argc, char * argv[]) { // TODO: If this is an archive, then burst it and dump each entry if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, buf)) llvm::errs() << "Error: '" << ec.message() << "' opening file '" - << InputFilename << "'" << endl; + << InputFilename << "'\n"; else { ec = coff2yaml(llvm::outs(), buf.take()); if (ec) - llvm::errs() << "Error: " << ec.message() << " dumping COFF file" << endl; + llvm::errs() << "Error: " << ec.message() << " dumping COFF file\n"; } return 0;