third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.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/compiler/javanano/javanano_generator.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/compiler/java/java_string_field_lite.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.cc b/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.cc

index a33eba1b0641cbaa1877dce5115fcb7309d013e1..7c3a04212fb0730230900c68b4391435c27f035c 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_generator.cc

@@ -68,12 +68,10 @@ void UpdateParamsRecursively(Params& params,

}

if (file->options().has_java_package()) {

string result = file->options().java_package();

- if (!file->options().javanano_use_deprecated_package()) {

- if (!result.empty()) {

- result += ".";

- }

- result += "nano";

+ if (!result.empty()) {

+ result += ".";

}

+ result += "nano";

params.set_java_package(

file->name(), result);

}