drop support for GCC 2.x as it is hopelessly broken anyway

[oota-llvm.git] / include / llvm / ADT / PointerIntPair.h

diff --git a/include/llvm/ADT/PointerIntPair.h b/include/llvm/ADT/PointerIntPair.h
index 5a9425457ddde1ec6c4e9a297192e4c29e8342aa..8b476199d38b53eb4272c87da04da029331a8508 100644 (file)
--- a/include/llvm/ADT/PointerIntPair.h
+++ b/include/llvm/ADT/PointerIntPair.h
@@ -14,13 +14,14 @@
 #ifndef LLVM_ADT_POINTERINTPAIR_H
 #define LLVM_ADT_POINTERINTPAIR_H
 
+#include "llvm/Support/DataTypes.h"
 #include <cassert>
 
 namespace llvm {
-  
+
 template<typename T>
 struct DenseMapInfo;
-  
+
 /// PointerIntPair - This class implements a pair of a pointer and small
 /// integer.  It is designed to represent this in the space required by one
 /// pointer by bitmangling the integer into the low part of the pointer.  This
@@ -40,32 +41,33 @@ public:
   PointerTy getPointer() const {
     return reinterpret_cast<PointerTy>(Value & ~((1 << IntBits)-1));
   }
-  
+
   IntType getInt() const {
     return (IntType)(Value & ((1 << IntBits)-1));
   }
-  
+
   void setPointer(PointerTy Ptr) {
     intptr_t PtrVal = reinterpret_cast<intptr_t>(Ptr);
     assert((PtrVal & ((1 << IntBits)-1)) == 0 &&
            "Pointer is not sufficiently aligned");
     Value = PtrVal | (intptr_t)getInt();
   }
-  
+
   void setInt(IntType Int) {
-    assert(unsigned(Int) < (1 << IntBits) && "Integer too large for field");
-    Value = reinterpret_cast<intptr_t>(getPointer()) | (intptr_t)Int;
+    intptr_t IntVal = Int;
+    assert(IntVal < (1 << IntBits) && "Integer too large for field");
+    Value = reinterpret_cast<intptr_t>(getPointer()) | IntVal;
   }
-  
+
   void *getOpaqueValue() const { return reinterpret_cast<void*>(Value); }
   void setFromOpaqueValue(void *Val) { Value = reinterpret_cast<intptr_t>(Val);}
-  
-  bool operator==(const PointerIntPair &RHS) const {
-    return Value == RHS.Value;
-  }
-  bool operator!=(const PointerIntPair &RHS) const {
-    return Value != RHS.Value;
-  }
+
+  bool operator==(const PointerIntPair &RHS) const {return Value == RHS.Value;}
+  bool operator!=(const PointerIntPair &RHS) const {return Value != RHS.Value;}
+  bool operator<(const PointerIntPair &RHS) const {return Value < RHS.Value;}
+  bool operator>(const PointerIntPair &RHS) const {return Value > RHS.Value;}
+  bool operator<=(const PointerIntPair &RHS) const {return Value <= RHS.Value;}
+  bool operator>=(const PointerIntPair &RHS) const {return Value >= RHS.Value;}
 };
 
 // Provide specialization of DenseMapInfo for PointerIntPair.