Changes in directory llvm/tools/llvm-as:
llvm-as.cpp updated: 1.49 -> 1.50
---
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: (+15 -15)
llvm-as.cpp | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
Index: llvm/tools/llvm-as/llvm-as.cpp
diff -u llvm/tools/llvm-as/llvm-as.cpp:1.49 llvm/tools/llvm-as/llvm-as.cpp:1.50
--- llvm/tools/llvm-as/llvm-as.cpp:1.49 Tue Dec 5 19:18:00 2006
+++ llvm/tools/llvm-as/llvm-as.cpp Wed Dec 6 19:30:31 2006
@@ -62,29 +62,29 @@
ParseError Err;
std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename,&Err));
if (M.get() == 0) {
- llvm_cerr << argv[0] << ": " << Err.getMessage() << "\n";
+ cerr << argv[0] << ": " << Err.getMessage() << "\n";
return 1;
}
if (!DisableVerify) {
std::string Err;
if (verifyModule(*M.get(), ReturnStatusAction, &Err)) {
- llvm_cerr << argv[0]
- << ": assembly parsed, but does not verify as correct!\n";
- llvm_cerr << Err;
+ cerr << argv[0]
+ << ": assembly parsed, but does not verify as correct!\n";
+ cerr << Err;
return 1;
}
}
- if (DumpAsm) llvm_cerr << "Here's the assembly:\n" << *M.get();
+ if (DumpAsm) cerr << "Here's the assembly:\n" << *M.get();
if (OutputFilename != "") { // Specified an output filename?
if (OutputFilename != "-") { // Not stdout?
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- llvm_cerr << argv[0] << ": error opening '" << OutputFilename
- << "': file exists!\n"
- << "Use -f command line argument to force output\n";
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists!\n"
+ << "Use -f command line argument to force output\n";
return 1;
}
Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
@@ -110,9 +110,9 @@
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- llvm_cerr << argv[0] << ": error opening '" << OutputFilename
- << "': file exists!\n"
- << "Use -f command line argument to force output\n";
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists!\n"
+ << "Use -f command line argument to force output\n";
return 1;
}
@@ -125,19 +125,19 @@
}
if (!Out->good()) {
- llvm_cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
+ cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
return 1;
}
if (Force || !CheckBytecodeOutputToConsole(Out,true)) {
- llvm_ostream L(*Out);
+ OStream L(*Out);
WriteBytecodeToFile(M.get(), L, !NoCompress);
}
} catch (const std::string& msg) {
- llvm_cerr << argv[0] << ": " << msg << "\n";
+ cerr << argv[0] << ": " << msg << "\n";
exitCode = 1;
} catch (...) {
- llvm_cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
+ cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
exitCode = 1;
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
