changes to make it compatible with 64bit gcc

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

12 files changed, 21 insertions, 18 deletions

diff --git a/include/Support/Statistic.h b/include/Support/Statistic.h
index 453af34fe0..8f6ed79da8 100644
--- a/include/Support/Statistic.h
+++ b/include/Support/Statistic.h
@@ -52,7 +52,7 @@ protected:
   void destroy() const;
 
   // printValue - Overridden by template class to print out the value type...
-  virtual void printValue(ostream &o) const = 0;
+  virtual void printValue(std::ostream &o) const = 0;
 
   // hasSomeData - Return true if some data has been aquired.  Avoid printing
   // lots of zero counts.
@@ -65,7 +65,7 @@ template <typename DataType=unsigned>
 class Statistic : private StatisticBase {
   DataType Value;
 
-  virtual void printValue(ostream &o) const { o << Value; }
+  virtual void printValue(std::ostream &o) const { o << Value; }
   virtual bool hasSomeData() const { return Value != DataType(); }
 public:
   // Normal constructor, default initialize data item...
diff --git a/include/Support/StatisticReporter.h b/include/Support/StatisticReporter.h
index 453af34fe0..8f6ed79da8 100644
--- a/include/Support/StatisticReporter.h
+++ b/include/Support/StatisticReporter.h
@@ -52,7 +52,7 @@ protected:
   void destroy() const;
 
   // printValue - Overridden by template class to print out the value type...
-  virtual void printValue(ostream &o) const = 0;
+  virtual void printValue(std::ostream &o) const = 0;
 
   // hasSomeData - Return true if some data has been aquired.  Avoid printing
   // lots of zero counts.
@@ -65,7 +65,7 @@ template <typename DataType=unsigned>
 class Statistic : private StatisticBase {
   DataType Value;
 
-  virtual void printValue(ostream &o) const { o << Value; }
+  virtual void printValue(std::ostream &o) const { o << Value; }
   virtual bool hasSomeData() const { return Value != DataType(); }
 public:
   // Normal constructor, default initialize data item...
diff --git a/include/Support/ilist b/include/Support/ilist
index 04cf596698..7e666c6d97 100644
--- a/include/Support/ilist
+++ b/include/Support/ilist
@@ -167,8 +167,8 @@ public:
   typedef ilist_iterator<const NodeTy> const_iterator;
   typedef size_t size_type;
   typedef ptrdiff_t difference_type;
-  typedef reverse_iterator<const_iterator>  const_reverse_iterator;
-  typedef reverse_iterator<iterator>  reverse_iterator;
+  typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
+  typedef std::reverse_iterator<iterator>  reverse_iterator;
 
   iplist() : Head(createNode()), Tail(Head) {
     setNext(Head, 0);
diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h
index 453af34fe0..8f6ed79da8 100644
--- a/include/llvm/ADT/Statistic.h
+++ b/include/llvm/ADT/Statistic.h
@@ -52,7 +52,7 @@ protected:
   void destroy() const;
 
   // printValue - Overridden by template class to print out the value type...
-  virtual void printValue(ostream &o) const = 0;
+  virtual void printValue(std::ostream &o) const = 0;
 
   // hasSomeData - Return true if some data has been aquired.  Avoid printing
   // lots of zero counts.
@@ -65,7 +65,7 @@ template <typename DataType=unsigned>
 class Statistic : private StatisticBase {
   DataType Value;
 
-  virtual void printValue(ostream &o) const { o << Value; }
+  virtual void printValue(std::ostream &o) const { o << Value; }
   virtual bool hasSomeData() const { return Value != DataType(); }
 public:
   // Normal constructor, default initialize data item...
diff --git a/include/llvm/ADT/ilist b/include/llvm/ADT/ilist
index 04cf596698..7e666c6d97 100644
--- a/include/llvm/ADT/ilist
+++ b/include/llvm/ADT/ilist
@@ -167,8 +167,8 @@ public:
   typedef ilist_iterator<const NodeTy> const_iterator;
   typedef size_t size_type;
   typedef ptrdiff_t difference_type;
-  typedef reverse_iterator<const_iterator>  const_reverse_iterator;
-  typedef reverse_iterator<iterator>  reverse_iterator;
+  typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
+  typedef std::reverse_iterator<iterator>  reverse_iterator;
 
   iplist() : Head(createNode()), Tail(Head) {
     setNext(Head, 0);
diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index 5f1617c0a0..c9b2018010 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -73,6 +73,7 @@ public:
   // operator< - Allow insertion into a map...
   bool operator<(const PointerValSet &PVS) const;
   bool operator==(const PointerValSet &PVS) const;
+  bool operator!=(const PointerValSet &PVS) const { return !operator==(PVS); }
 
   const PointerVal &operator[](unsigned i) const { return Vals[i]; }
 
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 5f1617c0a0..c9b2018010 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -73,6 +73,7 @@ public:
   // operator< - Allow insertion into a map...
   bool operator<(const PointerValSet &PVS) const;
   bool operator==(const PointerValSet &PVS) const;
+  bool operator!=(const PointerValSet &PVS) const { return !operator==(PVS); }
 
   const PointerVal &operator[](unsigned i) const { return Vals[i]; }
 
diff --git a/include/llvm/Bytecode/WriteBytecodePass.h b/include/llvm/Bytecode/WriteBytecodePass.h
index 297fbb76e1..3e6d7fef71 100644
--- a/include/llvm/Bytecode/WriteBytecodePass.h
+++ b/include/llvm/Bytecode/WriteBytecodePass.h
@@ -12,10 +12,10 @@
 #include "llvm/Bytecode/Writer.h"
 
 class WriteBytecodePass : public Pass {
-  ostream *Out;           // ostream to print on
+  std::ostream *Out;           // ostream to print on
   bool DeleteStream;
 public:
-  inline WriteBytecodePass(ostream *o = &cout, bool DS = false)
+  inline WriteBytecodePass(std::ostream *o = &std::cout, bool DS = false)
     : Out(o), DeleteStream(DS) {
   }
 
diff --git a/include/llvm/CodeGen/InstrSelection.h b/include/llvm/CodeGen/InstrSelection.h
index 1a3023018d..18f4b7fc62 100644
--- a/include/llvm/CodeGen/InstrSelection.h
+++ b/include/llvm/CodeGen/InstrSelection.h
@@ -30,7 +30,7 @@ extern void	GetInstructionsByRule	(InstructionNode* subtreeRoot,
 					 int ruleForNode,
 					 short* nts,
 					 TargetMachine &Target,
-                                         vector<MachineInstr*>& mvec);
+                                         std::vector<MachineInstr*>& mvec);
 
 extern bool	ThisIsAChainRule	(int eruleno);
 
diff --git a/include/llvm/CodeGen/MachineInstrAnnot.h b/include/llvm/CodeGen/MachineInstrAnnot.h
index 79298d5fb7..b16408f9a3 100644
--- a/include/llvm/CodeGen/MachineInstrAnnot.h
+++ b/include/llvm/CodeGen/MachineInstrAnnot.h
@@ -62,7 +62,7 @@ public:
 class CallArgsDescriptor: public Annotation { // Annotation for a MachineInstr
 private:
   static AnnotationID AID;              // AnnotationID for this class
-  vector<CallArgInfo> argInfoVec;       // Descriptor for each argument
+  std::vector<CallArgInfo> argInfoVec;       // Descriptor for each argument
   const CallInst* callInstr;            // The call instruction == result value
   const Value* funcPtr;                 // Pointer for indirect calls 
   TmpInstruction* retAddrReg;           // Tmp value for return address reg.
diff --git a/include/llvm/Target/TargetRegInfo.h b/include/llvm/Target/TargetRegInfo.h
index 99a89feb2e..af4750bba2 100644
--- a/include/llvm/Target/TargetRegInfo.h
+++ b/include/llvm/Target/TargetRegInfo.h
@@ -144,16 +144,16 @@ public:
   // necessary.
   //
   virtual void cpReg2RegMI(unsigned SrcReg, unsigned DestReg,
-                           int RegType, vector<MachineInstr*>& mvec) const = 0;
+                           int RegType, std::vector<MachineInstr*>& mvec) const = 0;
 
   virtual void cpReg2MemMI(unsigned SrcReg, unsigned DestPtrReg, int Offset,
-                           int RegTypee, vector<MachineInstr*>& mvec) const=0;
+                           int RegTypee, std::vector<MachineInstr*>& mvec) const=0;
 
   virtual void cpMem2RegMI(unsigned SrcPtrReg, int Offset, unsigned DestReg,
-                           int RegTypee, vector<MachineInstr*>& mvec) const=0;
+                           int RegTypee, std::vector<MachineInstr*>& mvec) const=0;
 
   virtual void cpValue2Value(Value *Src, Value *Dest,
-                             vector<MachineInstr*>& mvec) const = 0;
+                             std::vector<MachineInstr*>& mvec) const = 0;
 
   virtual bool isRegVolatile(int RegClassID, int Reg) const = 0;
   
diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index 573ca174de..e8930e6aca 100644
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -14,6 +14,7 @@
 #include "llvm/Annotation.h"
 #include "llvm/AbstractTypeUser.h"
 #include "Support/Casting.h"
+#include <ostream>
 
 class User;
 class Type;