summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2009-04-26 18:10:20 +0000
committerBill Wendling <isanbard@gmail.com>2009-04-26 18:10:20 +0000
commit995f81c5cea9fd0e55a9c37a33bb4c34be51a816 (patch)
treed9ee0e6c54218f0153aa9078a4ad791e1c255990
parent4c92b51089d21326a7c0d82625cb2a03f5174bb1 (diff)
downloadbcm5719-llvm-995f81c5cea9fd0e55a9c37a33bb4c34be51a816.tar.gz
bcm5719-llvm-995f81c5cea9fd0e55a9c37a33bb4c34be51a816.zip
Suppress warnings about conversion shortening 64-bit to 32-bit.
llvm-svn: 70138
-rw-r--r--llvm/include/llvm/ADT/PointerIntPair.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/llvm/include/llvm/ADT/PointerIntPair.h b/llvm/include/llvm/ADT/PointerIntPair.h
index 43a083d21ec..e987b104ebe 100644
--- a/llvm/include/llvm/ADT/PointerIntPair.h
+++ b/llvm/include/llvm/ADT/PointerIntPair.h
@@ -42,16 +42,18 @@ class PointerIntPair {
intptr_t Value;
enum {
/// PointerBitMask - The bits that come from the pointer.
- PointerBitMask = ~(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1),
+ PointerBitMask =
+ ~(unsigned)(((intptr_t)1 << PtrTraits::NumLowBitsAvailable)-1),
+
/// IntShift - The number of low bits that we reserve for other uses, and
/// keep zero.
- IntShift = PtrTraits::NumLowBitsAvailable-IntBits,
+ IntShift = (unsigned)PtrTraits::NumLowBitsAvailable-IntBits,
/// IntMask - This is the unshifted mask for valid bits of the int type.
- IntMask = ((intptr_t)1 << IntBits)-1,
+ IntMask = (unsigned)(((intptr_t)1 << IntBits)-1),
// ShiftedIntMask - This is the bits for the integer shifted in place.
- ShiftedIntMask = IntMask << IntShift
+ ShiftedIntMask = (unsigned)(IntMask << IntShift)
};
public:
PointerIntPair() : Value(0) {}
OpenPOWER on IntegriCloud