Fix more MSVC warnings, courgette/ edition.

courgette/adjustment_method_2.cc

Index: courgette/adjustment_method_2.cc
diff --git a/courgette/adjustment_method_2.cc b/courgette/adjustment_method_2.cc
index 791870a515338f1d1404b146524b3a5d689352bf..4c06af83833707e8b5e5da0f030f774c85f3cf12 100644
--- a/courgette/adjustment_method_2.cc
+++ b/courgette/adjustment_method_2.cc
@@ -647,11 +647,11 @@ ShinglePattern::Index::Index(const Shingle* instance) {
   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];