Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

Issue 21208003: Update protobuf to r428, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 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
Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
===================================================================
--- third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto (revision 216642)
+++ third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto (working copy)
@@ -103,9 +103,19 @@
message DO {}
optional DO do = 32;
+ // Some template parameter names for extensions.
+ optional int32 field_type = 33;
+ optional bool is_packed = 34;
+
extensions 1000 to max;
}
+message TestConflictingSymbolNamesExtension {
+ extend TestConflictingSymbolNames {
+ repeated int32 repeated_int32_ext = 20423638 [packed=true];
+ }
+}
+
message DummyMessage {}
service TestConflictingMethodNames {

Powered by Google App Engine
This is Rietveld 408576698