third_party/protobuf/src/google/protobuf/arenastring.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/arenastring.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years ago

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

Jump to:

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

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

index 5a22adabcfedd8be981358cb80f988fe7da1e31a..8ed299b35f63beff6699dfa9a3e91f016b1584e8 100644

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

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

@@ -44,7 +44,7 @@ void ArenaStringPtr::AssignWithDefault(const ::std::string* default_value,

const ::std::string* other = *value.UnsafeRawStringPointer();

// If the pointers are the same then do nothing.

if (me != other) {

- SetNoArena(default_value, value.GetNoArena(default_value));

+ SetNoArena(default_value, value.GetNoArena());

}