Remove spurious consts. This fixes warnings with compilers that

[oota-llvm.git] / lib / Support / SystemUtils.cpp

diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp
index 77c97f3111d51907c5cabdaaf677a2f6a4ac0d24..afa0d7e961b8c396d3fdbb06bb2257cc17fdf82f 100644 (file)
--- a/lib/Support/SystemUtils.cpp
+++ b/lib/Support/SystemUtils.cpp
@@ -12,20 +12,22 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Streams.h"
 #include "llvm/Support/SystemUtils.h"
 #include "llvm/System/Process.h"
 #include "llvm/System/Program.h"
-#include <iostream>
+#include <ostream>
 using namespace llvm;
 
-bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check,
-                                        bool print_warning) {
-  if (stream_to_check == &std::cout && sys::Process::StandardOutIsDisplayed()) {
+bool llvm::CheckBitcodeOutputToConsole(std::ostream* stream_to_check,
+                                       bool print_warning) {
+  if (stream_to_check == cout.stream() &&
+      sys::Process::StandardOutIsDisplayed()) {
     if (print_warning) {
-      std::cerr << "WARNING: You're attempting to print out a bytecode file.\n"
-                   "This is inadvisable as it may cause display problems. If\n"
-                   "you REALLY want to taste LLVM bytecode first-hand, you\n"
-                   "can force output with the `-f' option.\n\n";
+      cerr << "WARNING: You're attempting to print out a bitcode file.\n"
+           << "This is inadvisable as it may cause display problems. If\n"
+           << "you REALLY want to taste LLVM bitcode first-hand, you\n"
+           << "can force output with the `-f' option.\n\n";
     }
     return true;
   }
@@ -45,9 +47,9 @@ sys::Path llvm::FindExecutable(const std::string &ExeName,
   // if ProgramPath contains at least one / character, indicating that it is a
   // relative path to bugpoint itself.
   sys::Path Result ( ProgramPath );
-  Result.elideFile();
+  Result.eraseComponent();
   if (!Result.isEmpty()) {
-    Result.appendFile(ExeName);
+    Result.appendComponent(ExeName);
     if (Result.canExecute())
       return Result;
   }