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

Side by Side Diff: third_party/protobuf/java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 3 years, 12 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 unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 25 matching lines...) Expand all
36 syntax = "proto2"; 36 syntax = "proto2";
37 37
38 // Some generic_services option(s) added automatically. 38 // Some generic_services option(s) added automatically.
39 // See: http://go/proto2-generic-services-default 39 // See: http://go/proto2-generic-services-default
40 option java_generic_services = true; // auto-added 40 option java_generic_services = true; // auto-added
41 41
42 package io_protocol_tests; 42 package io_protocol_tests;
43 43
44 option java_package = "com.google.protobuf"; 44 option java_package = "com.google.protobuf";
45 option java_outer_classname = "TestBadIdentifiersProto"; 45 option java_outer_classname = "TestBadIdentifiersProto";
46 option java_generate_equals_and_hash = true;
46 47
47 message TestMessage { 48 message TestMessage {
48 optional string cached_size = 1; 49 optional string cached_size = 1;
49 optional string serialized_size = 2; 50 optional string serialized_size = 2;
50 optional string class = 3; 51 optional string class = 3;
51 } 52 }
52 53
53 message Descriptor { 54 message Descriptor {
54 option no_standard_descriptor_accessor = true; 55 option no_standard_descriptor_accessor = true;
55 optional string descriptor = 1; 56 optional string descriptor = 1;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } // NO_PROTO3 160 } // NO_PROTO3
160 } 161 }
161 162
162 message TestMapField { 163 message TestMapField {
163 message MapField {} 164 message MapField {}
164 message Pair {} 165 message Pair {}
165 message Message {} 166 message Message {}
166 167
167 map<int32, int32> map_field = 1; 168 map<int32, int32> map_field = 1;
168 } 169 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698