Switch to standard integer types in base/.

base/pickle.cc

 // Copyright (c) 2012 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 "base/pickle.h"
 
 #include <stdlib.h>
 
 #include <algorithm>  // for max()
 #include <limits>
 
 #include "base/bits.h"
 #include "base/macros.h"
+#include "build/build_config.h"
 
 namespace base {
 
 // static
 const int Pickle::kPayloadUnit = 64;
 
 static const size_t kCapacityReadOnly = static_cast<size_t>(-1);
 
 PickleIterator::PickleIterator(const Pickle& pickle)
     : payload_(pickle.payload()),
@@ skipping 40 matching lines @@
     return NULL;
   }
   const char* current_read_ptr = payload_ + read_index_;
   Advance(num_bytes);
   return current_read_ptr;
 }
 
 inline const char* PickleIterator::GetReadPointerAndAdvance(
     int num_elements,
     size_t size_element) {
-  // Check for int32 overflow.
+  // Check for int32_t overflow.
   int64_t num_bytes = static_cast<int64_t>(num_elements) * size_element;
   int num_bytes32 = static_cast<int>(num_bytes);
   if (num_bytes != static_cast<int64_t>(num_bytes32))
     return NULL;
   return GetReadPointerAndAdvance(num_bytes32);
 }
 
 bool PickleIterator::ReadBool(bool* result) {
   return ReadBuiltinType(result);
 }
@@ skipping 333 matching lines @@
 
 inline void Pickle::WriteBytesCommon(const void* data, size_t length) {
   DCHECK_NE(kCapacityReadOnly, capacity_after_header_)
       << "oops: pickle is readonly";
   MSAN_CHECK_MEM_IS_INITIALIZED(data, length);
   void* write = ClaimUninitializedBytesInternal(length);
   memcpy(write, data, length);
 }
 
 }  // namespace base