| Index: base/pickle.cc
|
| diff --git a/base/pickle.cc b/base/pickle.cc
|
| index 12a3237878825e449a3c216b4c74a2c3d8555425..38e20469a365fe2c1d3a91a96b0f277c5ee153bd 100644
|
| --- a/base/pickle.cc
|
| +++ b/base/pickle.cc
|
| @@ -24,7 +24,7 @@ PickleIterator::PickleIterator(const Pickle& pickle)
|
| }
|
|
|
| template <typename Type>
|
| -inline bool PickleIterator::ReadBuiltinType(Type* result) {
|
| +bool PickleIterator::ReadBuiltinType(Type* result) {
|
| const char* read_from = GetReadPointerAndAdvance<Type>();
|
| if (!read_from)
|
| return false;
|
| @@ -36,7 +36,7 @@ inline bool PickleIterator::ReadBuiltinType(Type* result) {
|
| }
|
|
|
| template<typename Type>
|
| -inline const char* PickleIterator::GetReadPointerAndAdvance() {
|
| +const char* PickleIterator::GetReadPointerAndAdvance() {
|
| const char* current_read_ptr = read_ptr_;
|
| if (read_ptr_ + sizeof(Type) > read_end_ptr_)
|
| return NULL;
|
| @@ -55,8 +55,8 @@ const char* PickleIterator::GetReadPointerAndAdvance(int num_bytes) {
|
| return current_read_ptr;
|
| }
|
|
|
| -inline const char* PickleIterator::GetReadPointerAndAdvance(int num_elements,
|
| - size_t size_element) {
|
| +const char* PickleIterator::GetReadPointerAndAdvance(int num_elements,
|
| + size_t size_element) {
|
| // Check for int32 overflow.
|
| int64 num_bytes = static_cast<int64>(num_elements) * size_element;
|
| int num_bytes32 = static_cast<int>(num_bytes);
|
| @@ -315,7 +315,7 @@ template void Pickle::WriteBytesStatic<2>(const void* data);
|
| template void Pickle::WriteBytesStatic<4>(const void* data);
|
| template void Pickle::WriteBytesStatic<8>(const void* data);
|
|
|
| -inline void Pickle::WriteBytesCommon(const void* data, size_t length) {
|
| +void Pickle::WriteBytesCommon(const void* data, size_t length) {
|
| DCHECK_NE(kCapacityReadOnly, capacity_after_header_)
|
| << "oops: pickle is readonly";
|
| size_t data_len = AlignInt(length, sizeof(uint32));
|
|
|