Fixes for re-enabling more MSVC level 4 warnings: net/quic/ edition

net/quic/crypto/strike_register.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/crypto/strike_register.h"
 
 #include "base/logging.h"
 
 using std::pair;
 using std::set;
 using std::vector;
 
 namespace net {
 
 // static
 const uint32 StrikeRegister::kExternalNodeSize = 24;
 // static
-const uint32 StrikeRegister::kNil = (1 << 31) | 1;
+const uint32 StrikeRegister::kNil = 0x80000001;

[Ryan Hamilton, 2014/07/08 03:37:08]

Out of curiosity, why this change?

[Peter Kasting, 2014/07/08 06:26:46]

1 << 31 is a (negative) signed value (because 1 is a signed value), thus
triggering the "signedness mismatch" warning.

[Ryan Hamilton, 2014/07/08 18:00:57]

AH. In that case, how about 1u << 31?  (We end up having to use 1u all the time
in EXPECT_EQ() for this reason).

[Peter Kasting, 2014/07/08 18:16:46]

That would certainly compile without error.  I personally find the hex form a
little nicer because to me it emphasizes the 32-bitness of the variable, but I'm
not wedded to it.  I can do whatever you prefer.  Should I change it?

[Ryan Hamilton, 2014/07/08 18:24:01]

Personally, I'd prefer 1u << 31 because when I see 0x8....1, I can't tell how
big that value is. They're both totally reasonable, of course.

[Peter Kasting, 2014/07/08 18:44:45]

Changed.

 // static
 const uint32 StrikeRegister::kExternalFlag = 1 << 23;
 
 // InternalNode represents a non-leaf node in the critbit tree. See the comment
 // in the .h file for details.
 class StrikeRegister::InternalNode {
  public:
   void SetChild(unsigned direction, uint32 child) {
     data_[direction] = (data_[direction] & 0xff) | (child << 8);
   }
@@ skipping 426 matching lines @@
       CHECK_EQ(free_internal_nodes.count(inter), 0u);
       CHECK_EQ(used_internal_nodes->count(inter), 0u);
       used_internal_nodes->insert(inter);
       ValidateTree(inter, bit, bits, free_internal_nodes, free_external_nodes,
                    used_internal_nodes, used_external_nodes);
     }
   }
 }
 
 }  // namespace net