Switch to standard integer types in courgette/.

courgette/label_manager.cc

 // Copyright 2015 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/label_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "courgette/consecutive_range_visitor.h"
 
 namespace courgette {
 
 LabelManager::RvaVisitor::~RvaVisitor() {}
 
@@ skipping 23 matching lines @@
   std::sort(rvas.begin(), rvas.end());
   size_t num_distinct_rva = 0;
   for (CRV it(rvas.begin(), rvas.end()); it.has_more(); it.advance())
     ++num_distinct_rva;
 
   // Reserve space for |labels_|, populate with sorted RVA and repeats.
   DCHECK(labels_.empty());
   labels_.reserve(num_distinct_rva);
   for (CRV it(rvas.begin(), rvas.end()); it.has_more(); it.advance()) {
     labels_.push_back(Label(*it.cur()));
-    base::CheckedNumeric<uint32> count = it.repeat();
+    base::CheckedNumeric<uint32_t> count = it.repeat();
     labels_.back().count_ = count.ValueOrDie();
   }
 }
 
-void LabelManager::RemoveUnderusedLabels(int32 count_threshold) {
+void LabelManager::RemoveUnderusedLabels(int32_t count_threshold) {
   if (count_threshold <= 0)
     return;
   labels_.erase(std::remove_if(labels_.begin(), labels_.end(),
                                [count_threshold](const Label& label) {
                                  return label.count_ < count_threshold;
                                }),
                 labels_.end());
   // Not shrinking |labels_|, since this may cause reallocation.
 }
 
 // Uses binary search to find |rva|.
 Label* LabelManager::Find(RVA rva) {
   auto it = std::lower_bound(
       labels_.begin(), labels_.end(), Label(rva),
       [](const Label& l1, const Label& l2) { return l1.rva_ < l2.rva_; });
   return it == labels_.end() || it->rva_ != rva ? nullptr : &(*it);
 }
 
 }  // namespace courgette