[llvm-commits] [llvm] r70153 - /llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h

[Bill Wendling]

Author: void
Date: Sun Apr 26 15:13:44 2009
New Revision: 70153

URL: http://llvm.org/viewvc/llvm-project?rev=70153&view=rev
Log:
Avoid warnings.

Modified:
    llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h

Modified: llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h?rev=70153&r1=70152&r2=70153&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h (original)
+++ llvm/tags/Apple/llvmCore-2107.1/include/llvm/ADT/PointerIntPair.h Sun Apr 26 15:13:44 2009
@@ -43,17 +43,17 @@
   enum {
     /// PointerBitMask - The bits that come from the pointer.
     PointerBitMask =
-      ~(uint64_t)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1),
+      ~(uintptr_t)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1),
 
     /// IntShift - The number of low bits that we reserve for other uses, and
     /// keep zero.
-    IntShift = (uint64_t)PtrTraits::NumLowBitsAvailable-IntBits,
+    IntShift = (uintptr_t)PtrTraits::NumLowBitsAvailable-IntBits,
     
     /// IntMask - This is the unshifted mask for valid bits of the int type.
-    IntMask = (uint64_t)(((intptr_t)1 << IntBits)-1),
+    IntMask = (uintptr_t)(((intptr_t)1 << IntBits)-1),
     
     // ShiftedIntMask - This is the bits for the integer shifted in place.
-    ShiftedIntMask = (uint64_t)(IntMask << IntShift)
+    ShiftedIntMask = (uintptr_t)(IntMask << IntShift)
   };
 public:
   PointerIntPair() : Value(0) {}