[llvm-commits] CVS: llvm/lib/Linker/LinkModules.cpp Linker.cpp
Bill Wendling
isanbard at gmail.com
Wed Dec 6 17:31:56 PST 2006
Changes in directory llvm/lib/Linker:
LinkModules.cpp updated: 1.120 -> 1.121
Linker.cpp updated: 1.12 -> 1.13
---
Log message:
Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.
---
Diffs of the changes: (+11 -12)
LinkModules.cpp | 17 ++++++++---------
Linker.cpp | 6 +++---
2 files changed, 11 insertions(+), 12 deletions(-)
Index: llvm/lib/Linker/LinkModules.cpp
diff -u llvm/lib/Linker/LinkModules.cpp:1.120 llvm/lib/Linker/LinkModules.cpp:1.121
--- llvm/lib/Linker/LinkModules.cpp:1.120 Thu Nov 30 18:25:12 2006
+++ llvm/lib/Linker/LinkModules.cpp Wed Dec 6 19:30:31 2006
@@ -25,7 +25,6 @@
#include "llvm/Assembly/Writer.h"
#include "llvm/Support/Streams.h"
#include "llvm/System/Path.h"
-#include <sstream>
using namespace llvm;
// Error - Simple wrapper function to conditionally assign to E and return true.
@@ -251,11 +250,11 @@
static void PrintMap(const std::map<const Value*, Value*> &M) {
for (std::map<const Value*, Value*>::const_iterator I = M.begin(), E =M.end();
I != E; ++I) {
- llvm_cerr << " Fr: " << (void*)I->first << " ";
+ cerr << " Fr: " << (void*)I->first << " ";
I->first->dump();
- llvm_cerr << " To: " << (void*)I->second << " ";
+ cerr << " To: " << (void*)I->second << " ";
I->second->dump();
- llvm_cerr << "\n";
+ cerr << "\n";
}
}
@@ -313,10 +312,10 @@
}
- llvm_cerr << "LinkModules ValueMap: \n";
+ cerr << "LinkModules ValueMap: \n";
PrintMap(ValueMap);
- llvm_cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
+ cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
assert(0 && "Couldn't remap value!");
return 0;
}
@@ -844,13 +843,13 @@
if (Src->getEndianness() != Module::AnyEndianness &&
Dest->getEndianness() != Src->getEndianness())
- llvm_cerr << "WARNING: Linking two modules of different endianness!\n";
+ cerr << "WARNING: Linking two modules of different endianness!\n";
if (Src->getPointerSize() != Module::AnyPointerSize &&
Dest->getPointerSize() != Src->getPointerSize())
- llvm_cerr << "WARNING: Linking two modules of different pointer size!\n";
+ cerr << "WARNING: Linking two modules of different pointer size!\n";
if (!Src->getTargetTriple().empty() &&
Dest->getTargetTriple() != Src->getTargetTriple())
- llvm_cerr << "WARNING: Linking two modules of different target triples!\n";
+ cerr << "WARNING: Linking two modules of different target triples!\n";
if (!Src->getModuleInlineAsm().empty()) {
if (Dest->getModuleInlineAsm().empty())
Index: llvm/lib/Linker/Linker.cpp
diff -u llvm/lib/Linker/Linker.cpp:1.12 llvm/lib/Linker/Linker.cpp:1.13
--- llvm/lib/Linker/Linker.cpp:1.12 Mon Nov 27 04:09:12 2006
+++ llvm/lib/Linker/Linker.cpp Wed Dec 6 19:30:31 2006
@@ -45,7 +45,7 @@
Linker::error(const std::string& message) {
Error = message;
if (!(Flags&QuietErrors))
- llvm_cerr << ProgramName << ": error: " << message << "\n";
+ cerr << ProgramName << ": error: " << message << "\n";
return true;
}
@@ -53,14 +53,14 @@
Linker::warning(const std::string& message) {
Error = message;
if (!(Flags&QuietErrors))
- llvm_cerr << ProgramName << ": warning: " << message << "\n";
+ cerr << ProgramName << ": warning: " << message << "\n";
return false;
}
void
Linker::verbose(const std::string& message) {
if (Flags&Verbose)
- llvm_cerr << " " << message << "\n";
+ cerr << " " << message << "\n";
}
void
More information about the llvm-commits
mailing list