third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/conformance/conformance.proto

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 192 matching lines @@
   map <  string, NestedMessage>  map_string_nested_message = 71;
   map <  string, ForeignMessage> map_string_foreign_message = 72;
   map <  string, NestedEnum>     map_string_nested_enum = 73;
   map <  string, ForeignEnum>    map_string_foreign_enum = 74;
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;
     NestedMessage oneof_nested_message = 112;
     string oneof_string = 113;
     bytes oneof_bytes = 114;
+    bool oneof_bool = 115;
+    uint64 oneof_uint64 = 116;
+    float oneof_float = 117;
+    double oneof_double = 118;
+    NestedEnum oneof_enum = 119;
   }
 
   // Well-known types
   google.protobuf.BoolValue optional_bool_wrapper = 201;
   google.protobuf.Int32Value optional_int32_wrapper = 202;
   google.protobuf.Int64Value optional_int64_wrapper = 203;
   google.protobuf.UInt32Value optional_uint32_wrapper = 204;
   google.protobuf.UInt64Value optional_uint64_wrapper = 205;
   google.protobuf.FloatValue optional_float_wrapper = 206;
   google.protobuf.DoubleValue optional_double_wrapper = 207;
@@ skipping 18 matching lines @@
   google.protobuf.Value optional_value = 306;
 
   repeated google.protobuf.Duration repeated_duration = 311;
   repeated google.protobuf.Timestamp repeated_timestamp = 312;
   repeated google.protobuf.FieldMask repeated_fieldmask = 313;
   repeated google.protobuf.Struct repeated_struct = 324;
   repeated google.protobuf.Any repeated_any = 315;
   repeated google.protobuf.Value repeated_value = 316;
 
   // Test field-name-to-JSON-name convention.
+  // (protobuf says names can be any valid C/C++ identifier.)
   int32 fieldname1 = 401;
   int32 field_name2 = 402;
   int32 _field_name3 = 403;
   int32 field__name4_ = 404;
   int32 field0name5 = 405;
   int32 field_0_name6 = 406;
   int32 fieldName7 = 407;
   int32 FieldName8 = 408;
   int32 field_Name9 = 409;
   int32 Field_Name10 = 410;
   int32 FIELD_NAME11 = 411;
   int32 FIELD_name12 = 412;
+  int32 __field_name13 = 413;
+  int32 __Field_name14 = 414;
+  int32 field__name15 = 415;
+  int32 field__Name16 = 416;
+  int32 field_name17__ = 417;
+  int32 Field_name18__ = 418;
 }
 
 message ForeignMessage {
   int32 c = 1;
 }
 
 enum ForeignEnum {
   FOREIGN_FOO = 0;
   FOREIGN_BAR = 1;
   FOREIGN_BAZ = 2;
 }