[llvm-branch-commits] [llvm-branch] r70139 - /llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h
Bill Wendling
isanbard at gmail.com
Sun Apr 26 11:11:00 PDT 2009
Author: void
Date: Sun Apr 26 13:11:00 2009
New Revision: 70139
URL: http://llvm.org/viewvc/llvm-project?rev=70139&view=rev
Log:
Suppress warnings about conversion shortening 64-bit to 32-bit.
Modified:
llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h
Modified: llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h?rev=70139&r1=70138&r2=70139&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h (original)
+++ llvm/branches/Apple/Dib/include/llvm/ADT/PointerIntPair.h Sun Apr 26 13:11:00 2009
@@ -42,16 +42,18 @@
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) {}
More information about the llvm-branch-commits
mailing list