From 4a9f9337511441af0624e754ad9b2b1262ee584d Mon Sep 17 00:00:00 2001 From: Anand Shukla Date: Tue, 25 Jun 2002 20:22:25 +0000 Subject: [PATCH] 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 --- include/Support/Statistic.h | 4 ++-- include/Support/StatisticReporter.h | 4 ++-- include/Support/ilist | 4 ++-- include/llvm/ADT/Statistic.h | 4 ++-- include/llvm/ADT/ilist | 4 ++-- include/llvm/Analysis/DataStructure.h | 1 + include/llvm/Analysis/DataStructure/DataStructure.h | 1 + include/llvm/Bytecode/WriteBytecodePass.h | 4 ++-- include/llvm/CodeGen/InstrSelection.h | 2 +- include/llvm/CodeGen/MachineInstrAnnot.h | 2 +- include/llvm/Target/TargetRegInfo.h | 8 ++++---- include/llvm/Value.h | 1 + lib/Target/SparcV9/MachineInstrAnnot.h | 2 +- 13 files changed, 22 insertions(+), 19 deletions(-) diff --git a/include/Support/Statistic.h b/include/Support/Statistic.h index 453af34fe01..8f6ed79da8f 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 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 453af34fe01..8f6ed79da8f 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 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 04cf596698d..7e666c6d97f 100644 --- a/include/Support/ilist +++ b/include/Support/ilist @@ -167,8 +167,8 @@ public: typedef ilist_iterator const_iterator; typedef size_t size_type; typedef ptrdiff_t difference_type; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 453af34fe01..8f6ed79da8f 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 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 04cf596698d..7e666c6d97f 100644 --- a/include/llvm/ADT/ilist +++ b/include/llvm/ADT/ilist @@ -167,8 +167,8 @@ public: typedef ilist_iterator const_iterator; typedef size_t size_type; typedef ptrdiff_t difference_type; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 5f1617c0a02..c9b20180105 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 5f1617c0a02..c9b20180105 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 297fbb76e17..3e6d7fef715 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 1a3023018d1..18f4b7fc628 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& mvec); + std::vector& mvec); extern bool ThisIsAChainRule (int eruleno); diff --git a/include/llvm/CodeGen/MachineInstrAnnot.h b/include/llvm/CodeGen/MachineInstrAnnot.h index 79298d5fb74..b16408f9a36 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 argInfoVec; // Descriptor for each argument + std::vector 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 99a89feb2e8..af4750bba2b 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& mvec) const = 0; + int RegType, std::vector& mvec) const = 0; virtual void cpReg2MemMI(unsigned SrcReg, unsigned DestPtrReg, int Offset, - int RegTypee, vector& mvec) const=0; + int RegTypee, std::vector& mvec) const=0; virtual void cpMem2RegMI(unsigned SrcPtrReg, int Offset, unsigned DestReg, - int RegTypee, vector& mvec) const=0; + int RegTypee, std::vector& mvec) const=0; virtual void cpValue2Value(Value *Src, Value *Dest, - vector& mvec) const = 0; + std::vector& 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 573ca174dee..e8930e6aca4 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 class User; class Type; diff --git a/lib/Target/SparcV9/MachineInstrAnnot.h b/lib/Target/SparcV9/MachineInstrAnnot.h index 79298d5fb74..b16408f9a36 100644 --- a/lib/Target/SparcV9/MachineInstrAnnot.h +++ b/lib/Target/SparcV9/MachineInstrAnnot.h @@ -62,7 +62,7 @@ public: class CallArgsDescriptor: public Annotation { // Annotation for a MachineInstr private: static AnnotationID AID; // AnnotationID for this class - vector argInfoVec; // Descriptor for each argument + std::vector 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. -- 2.34.1