Re-enable several MSVC warnings

core/fxcrt/fx_basic_maps.cpp

Index: core/fxcrt/fx_basic_maps.cpp
diff --git a/core/fxcrt/fx_basic_maps.cpp b/core/fxcrt/fx_basic_maps.cpp
index eb4f2868f52683a973356d1f55a81f19ea9c93fa..a83ed660cf13b51e75f422f5b0395ff775acca6f 100644
--- a/core/fxcrt/fx_basic_maps.cpp
+++ b/core/fxcrt/fx_basic_maps.cpp
@@ -39,18 +39,17 @@ void CFX_MapPtrToPtr::GetNextAssoc(FX_POSITION& rNextPosition,
   ASSERT(pAssocRet);
   if (pAssocRet == (CAssoc*)-1) {
     for (FX_DWORD nBucket = 0; nBucket < m_nHashTableSize; nBucket++) {
-      if ((pAssocRet = m_pHashTable[nBucket]))
+      pAssocRet = m_pHashTable[nBucket];
+      if (pAssocRet)
         break;
     }
     ASSERT(pAssocRet);
   }
-  CAssoc* pAssocNext;
-  if ((pAssocNext = pAssocRet->pNext) == NULL) {
+  CAssoc* pAssocNext = pAssocRet->pNext;
+  if (!pAssocNext) {

[Tom Sepez, 2016/03/17 16:40:05]

Do we still need this if given the check at 51?

[Wei Li, 2016/03/18 17:42:39]

Done.

     for (FX_DWORD nBucket = (HashKey(pAssocRet->key) % m_nHashTableSize) + 1;

[Tom Sepez, 2016/03/17 16:40:05]

nit: [super nit] Maybe this reads cleaner as 
CAssoc* pAssocNext = pAssocRet->pNext;
FX_DWORD nBucket = (HashKey(pAssocRet->key) % m_nHashTableSize) + 1;
while (!pAssocNext && nBucket < m_nHashTableSize)
  pAssocNext = m_pHashTable[nBucket++];

but double-check my logic.  

[Wei Li, 2016/03/18 17:42:39]

I agree with you on the readability for the loop. On the other hand, the nBucket
can be confined within the loop. So how about leave it for now?

-         nBucket < m_nHashTableSize; nBucket++) {
-      if ((pAssocNext = m_pHashTable[nBucket])) {
-        break;
-      }
+         nBucket < m_nHashTableSize && !pAssocNext; nBucket++) {
+      pAssocNext = m_pHashTable[nBucket];
     }
   }
   rNextPosition = (FX_POSITION)pAssocNext;