summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2012-10-31 20:56:43 +0000
committerGreg Clayton <gclayton@apple.com>2012-10-31 20:56:43 +0000
commitb70c2309b6031c3544b14c426c1a9340366d10e3 (patch)
tree4564a796efc44374e48ef26f1011b367657002e1
parent6d7d39783da18067baa07d73d2d1a4aefb9b32bf (diff)
downloadbcm5719-llvm-b70c2309b6031c3544b14c426c1a9340366d10e3.tar.gz
bcm5719-llvm-b70c2309b6031c3544b14c426c1a9340366d10e3.zip
More fixes from MSVC warnings found by Carlo Kok.
llvm-svn: 167171
-rw-r--r--lldb/source/Core/DataExtractor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp
index 353fd26f042..d08679cd7da 100644
--- a/lldb/source/Core/DataExtractor.cpp
+++ b/lldb/source/Core/DataExtractor.cpp
@@ -717,10 +717,10 @@ DataExtractor::GetMaxS64Bitfield (uint32_t *offset_ptr, uint32_t size, uint32_t
{
if (bitfield_bit_offset > 0)
sval64 >>= bitfield_bit_offset;
- uint64_t bitfield_mask = ((1 << bitfield_bit_size) - 1);
+ uint64_t bitfield_mask = (((uint64_t)1) << bitfield_bit_size) - 1;
sval64 &= bitfield_mask;
// sign extend if needed
- if (sval64 & (1 << (bitfield_bit_size - 1)))
+ if (sval64 & (((uint64_t)1) << (bitfield_bit_size - 1)))
sval64 |= ~bitfield_mask;
}
return sval64;
OpenPOWER on IntegriCloud