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

Side by Side Diff: third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test2.proto

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, 6 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 15 matching lines...) Expand all
26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 30
31 syntax = "proto2"; 31 syntax = "proto2";
32 32
33 package google.protobuf.python.internal; 33 package google.protobuf.python.internal;
34 34
35 import "google/protobuf/internal/descriptor_pool_test1.proto"; 35 import "google/protobuf/internal/descriptor_pool_test1.proto";
36 import public "google/protobuf/internal/more_messages.proto";
36 37
37 38
38 message DescriptorPoolTest3 { 39 message DescriptorPoolTest3 {
39 40
40 extend DescriptorPoolTest1 { 41 extend DescriptorPoolTest1 {
41 optional DescriptorPoolTest3 descriptor_pool_test = 1001; 42 optional DescriptorPoolTest3 descriptor_pool_test = 1001;
42 } 43 }
43 44
44 enum NestedEnum { 45 enum NestedEnum {
45 NU = 13; 46 NU = 13;
(...skipping 17 matching lines...) Expand all
63 SIGMA = 18; 64 SIGMA = 18;
64 } 65 }
65 optional NestedEnum nested_enum = 1 [default = RHO]; 66 optional NestedEnum nested_enum = 1 [default = RHO];
66 optional string nested_field = 2 [default = "sigma"]; 67 optional string nested_field = 2 [default = "sigma"];
67 } 68 }
68 } 69 }
69 70
70 optional NestedMessage nested_message = 2; 71 optional NestedMessage nested_message = 2;
71 } 72 }
72 73
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698