third_party/protobuf/src/google/protobuf/util/internal/utility.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/util/internal/utility.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/util/internal/type_info_test_helper.cc ('k') | third_party/protobuf/src/google/protobuf/util/json_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/util/internal/utility.cc

diff --git a/third_party/protobuf/src/google/protobuf/util/internal/utility.cc b/third_party/protobuf/src/google/protobuf/util/internal/utility.cc

index 1ddf248774e5546a07f0123207ac90e58b2b4ddd..ee7a51fc41b6db81b4ee9b58cfaa11d7a023791e 100644

--- a/third_party/protobuf/src/google/protobuf/util/internal/utility.cc

+++ b/third_party/protobuf/src/google/protobuf/util/internal/utility.cc

@@ -222,6 +222,7 @@ string ToCamelCase(const StringPiece input) {

if (!result.empty() && is_cap &&

(!was_cap || (i + 1 < input.size() && ascii_islower(input[i + 1])))) {

first_word = false;

+ result.push_back(input[i]);

} else {

result.push_back(ascii_tolower(input[i]));

continue;

@@ -231,9 +232,13 @@ string ToCamelCase(const StringPiece input) {

if (ascii_islower(input[i])) {

result.push_back(ascii_toupper(input[i]));

continue;

+ } else {

+ result.push_back(input[i]);

+ continue;

}

+ } else {

+ result.push_back(ascii_tolower(input[i]));

}

- result.push_back(input[i]);

}

return result;

}