Fix more MSVC warnings, courgette/ edition.

courgette/adjustment_method_2.cc

 // Copyright (c) 2011 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 "courgette/adjustment_method.h"
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <map>
@@ skipping 629 matching lines @@
   h += v;
   return (h * (37 + 0x0000d100)) ^ (h >> 13);
 }
 
 ShinglePattern::Index::Index(const Shingle* instance) {
   uint32 hash = 0;
   variables_ = 0;
   unique_variables_ = 0;
   first_variable_index_ = 255;
 
-  for (uint32 i = 0; i < Shingle::kWidth; ++i) {
+  for (uint8 i = 0; i < Shingle::kWidth; ++i) {
     LabelInfo* info = instance->at(i);
-    uint32 kind = 0;
+    uint8 kind = 0;

[Peter Kasting, 2014/09/30 00:08:01]

Changed this because it's going to be stored back into |kinds_| (uint8[]) at the
bottom of the loop.  Changed the other two types to match.

This is guaranteed to be safe; nothing in this loop can set these variables to
anything beyond uint8_max.

[dgarrett, 2014/10/01 20:49:37]

Seems like Shingle::kWidth should also be updated to match. Is that awkward
somehow?

[Peter Kasting, 2014/10/01 22:12:05]

It just involves touching more code, but you're right, it probably should be
updated to prevent someone from making it >= UINT8_MAX in the future.  Changed.

     int code = -1;
-    size_t j = 0;
+    uint8 j = 0;
     for ( ; j < i; ++j) {
       if (info == instance->at(j)) {  // Duplicate LabelInfo
         kind = kinds_[j];
         break;
       }
     }
     if (j == i) {  // Not found above.
       if (info->assignment_) {
         code = info->label_->index_;
         assigned_indexes_[i] = code;
@@ skipping 625 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace adjustment_method_2
 
 AdjustmentMethod* AdjustmentMethod::MakeShingleAdjustmentMethod() {
   return new adjustment_method_2::Adjuster();
 }
 
 }  // namespace courgette