third_party/protobuf/src/google/protobuf/repeated_field.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/repeated_field.cc

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/repeated_field.h ('k') | third_party/protobuf/src/google/protobuf/repeated_field_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/repeated_field.cc

diff --git a/third_party/protobuf/src/google/protobuf/repeated_field.cc b/third_party/protobuf/src/google/protobuf/repeated_field.cc

index 949e0a235dffa35604378e79684d6f156e6061ce..77004f59af9ce53f7727fc56bc8aba4d5969f267 100644

--- a/third_party/protobuf/src/google/protobuf/repeated_field.cc

+++ b/third_party/protobuf/src/google/protobuf/repeated_field.cc

@@ -52,8 +52,8 @@ void** RepeatedPtrFieldBase::InternalExtend(int extend_amount) {

}

Rep* old_rep = rep_;

Arena* arena = GetArenaNoVirtual();

- new_size = max(kMinRepeatedFieldAllocationSize,

- max(total_size_ * 2, new_size));

+ new_size = std::max(kMinRepeatedFieldAllocationSize,

+ std::max(total_size_ * 2, new_size));

GOOGLE_CHECK_LE(new_size,

(std::numeric_limits<size_t>::max() - kRepHeaderSize) /

sizeof(old_rep->elements[0]))