From: Orvid King <blah38621@gmail.com>
Date: Mon, 27 Jul 2015 22:09:31 +0000 (-0700)
Subject: Adjust a literal in AtomicHashMap.h to be correctly sized
X-Git-Tag: v0.53.0~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=150fc4e9c0f136baabdc50ca01498af4240c6a20;p=folly.git

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
---

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) {}