Fix more MSVC warnings, courgette/ edition.

courgette/assembly_program.h

 // 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.
 
 #ifndef COURGETTE_ASSEMBLY_PROGRAM_H_
 #define COURGETTE_ASSEMBLY_PROGRAM_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 69 matching lines @@
   // Generates an ELF style relocation table for ARM.
   CheckBool EmitElfARMRelocationInstruction() WARN_UNUSED_RESULT;
 
   // Following instruction will be assembled at address 'rva'.
   CheckBool EmitOriginInstruction(RVA rva) WARN_UNUSED_RESULT;
 
   // Generates a single byte of data or machine instruction.
   CheckBool EmitByteInstruction(uint8 byte) WARN_UNUSED_RESULT;
 
   // Generates multiple bytes of data or machine instructions.
-  CheckBool EmitBytesInstruction(const uint8* value, uint32 len)
+  CheckBool EmitBytesInstruction(const uint8* value, size_t len)
       WARN_UNUSED_RESULT;
 
   // Generates 4-byte relative reference to address of 'label'.
   CheckBool EmitRel32(Label* label) WARN_UNUSED_RESULT;
 
   // Generates 4-byte relative reference to address of 'label' for
   // ARM.
   CheckBool EmitRel32ARM(uint16 op, Label* label, const uint8* arm_op,
                          uint16 op_size) WARN_UNUSED_RESULT;
 
@@ skipping 21 matching lines @@
   // otherwise returns NULL.
   Label* InstructionAbs32Label(const Instruction* instruction) const;
 
   // Returns the label if the instruction contains and rel32 offset,
   // otherwise returns NULL.
   Label* InstructionRel32Label(const Instruction* instruction) const;
 
   // Trim underused labels
   CheckBool TrimLabels();
 
-  void PrintLabelCounts(RVAToLabel* labels);
-  void CountRel32ARM();
-
  private:
   ExecutableType kind_;
 
   CheckBool Emit(Instruction* instruction) WARN_UNUSED_RESULT;
 
   static const int kLabelLowerLimit;
 
   // Looks up a label or creates a new one.  Might return NULL.
   Label* FindLabel(RVA rva, RVAToLabel* labels);
 
@@ skipping 14 matching lines @@
   // We have separate label spaces for addresses referenced by rel32 labels and
   // abs32 labels.  This is somewhat arbitrary.
   RVAToLabel rel32_labels_;
   RVAToLabel abs32_labels_;
 
   DISALLOW_COPY_AND_ASSIGN(AssemblyProgram);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_ASSEMBLY_PROGRAM_H_