changes for 64bit gcc

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2801 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp
index ae659da3fb0d2a61d25b7e8aea5fd09abfe34ade..db2614e452778550e53abf42a631c0bae832e6d3 100644 (file)
--- a/lib/VMCore/Pass.cpp
+++ b/lib/VMCore/Pass.cpp
@@ -105,7 +105,7 @@ TimingInfo::~TimingInfo() {
   // Iterate over all of the data, converting it into the dual of the data map,
   // so that the data is sorted by amount of time taken, instead of pointer.
   //
-  std::vector<pair<double, Pass*> > Data;
+  std::vector<std::pair<double, Pass*> > Data;
   double TotalTime = 0;
   for (std::map<Pass*, double>::iterator I = TimingData.begin(),
          E = TimingData.end(); I != E; ++I)
@@ -116,10 +116,10 @@ TimingInfo::~TimingInfo() {
     }
   
   // Sort the data by time as the primary key, in reverse order...
-  std::sort(Data.begin(), Data.end(), greater<pair<double, Pass*> >());
+  std::sort(Data.begin(), Data.end(), std::greater<std::pair<double, Pass*> >());
 
   // Print out timing header...
-  cerr << std::string(79, '=') << "\n"
+  std::cerr << std::string(79, '=') << "\n"
        << "                      ... Pass execution timing report ...\n"
        << std::string(79, '=') << "\n  Total Execution Time: " << TotalTime
        << " seconds\n\n  % Time: Seconds:\tPass Name:\n";
@@ -129,7 +129,7 @@ TimingInfo::~TimingInfo() {
     fprintf(stderr, "  %6.2f%% %fs\t%s\n", Data[i].first*100 / TotalTime,
             Data[i].first, Data[i].second->getPassName());
   }
-  cerr << "  100.00% " << TotalTime << "s\tTOTAL\n"
+  std::cerr << "  100.00% " << TotalTime << "s\tTOTAL\n"
        << std::string(79, '=') << "\n";
 }
 

diff --git a/lib/VMCore/PassManagerT.h b/lib/VMCore/PassManagerT.h
index 845e5cd925417dfd810f99d1b7ae384ae8d4d8db..593e7e09eed5a700fd81c0361a30cc53b0faf494 100644 (file)
--- a/lib/VMCore/PassManagerT.h
+++ b/lib/VMCore/PassManagerT.h
@@ -142,7 +142,7 @@ public:
 
 #ifndef NDEBUG
       // All Required analyses should be available to the pass as it runs!
-      for (vector<AnalysisID>::const_iterator
+      for (std::vector<AnalysisID>::const_iterator
              I = AnUsage.getRequiredSet().begin(), 
              E = AnUsage.getRequiredSet().end(); I != E; ++I) {
         assert(getAnalysisOrNullUp(*I) && "Analysis used but not available!");

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index da3d87f9d2e7b7c4d623b7630a1767db3e738e33..3ac0f107218ed037604f40267d01fed3dc07503a 100644 (file)
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -8,7 +8,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
 #include <algorithm>
-
+#include <iostream>
 //===----------------------------------------------------------------------===//
 //                                Value Class
 //===----------------------------------------------------------------------===//

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 605764a238fd3624cb07326b6e0bdff879e1dfec..c773b80642868af827993f4b1d1ad0dd73557022 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -49,6 +49,7 @@
 #include "llvm/Support/InstVisitor.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
+#include <iostream>
 
 namespace {  // Anonymous namespace for class
 
@@ -76,7 +77,7 @@ namespace {  // Anonymous namespace for class
           CheckFailed("Function Declaration has Internal Linkage!", I);
 
       if (Broken) {
-        cerr << "Broken module found, compilation aborted!\n";
+        std::cerr << "Broken module found, compilation aborted!\n";
         abort();
       }
       return false;