From 150fc4e9c0f136baabdc50ca01498af4240c6a20 Mon Sep 17 00:00:00 2001 From: Orvid King Date: Mon, 27 Jul 2015 15:09:31 -0700 Subject: [PATCH] Adjust a literal in AtomicHashMap.h to be correctly sized Summary: Noticed because of a warning emitted by MSVC, this fixees the literal for `kLockedPtr_` to correctly be 64-bits under MSVC, rather than 32-bit. Closes #245 Reviewed By: @yfeldblum Differential Revision: D2282806 Pulled By: @sgolemon --- folly/AtomicHashMap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h index 5b58feea..52d2fb0d 100644 --- a/folly/AtomicHashMap.h +++ b/folly/AtomicHashMap.h @@ -385,7 +385,7 @@ class AtomicHashMap : boost::noncopyable { static const uint32_t kSubMapIndexShift_ = 32 - kNumSubMapBits_ - 1; static const uint32_t kSubMapIndexMask_ = (1 << kSubMapIndexShift_) - 1; static const uint32_t kNumSubMaps_ = 1 << kNumSubMapBits_; - static const uintptr_t kLockedPtr_ = 0x88ul << 48; // invalid pointer + static const uintptr_t kLockedPtr_ = 0x88ULL << 48; // invalid pointer struct SimpleRetT { uint32_t i; size_t j; bool success; SimpleRetT(uint32_t ii, size_t jj, bool s) : i(ii), j(jj), success(s) {} -- 2.34.1