From d64a2d9941c36a7bc2a7959ea10ab8363192ac14 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Wed, 29 Jun 2016 15:23:27 -0700
Subject: Integrated internal changes from Google

This includes all internal changes from around May 20 to now.
---
 src/google/protobuf/unittest_custom_options.proto | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/google/protobuf/unittest_custom_options.proto')

diff --git a/src/google/protobuf/unittest_custom_options.proto b/src/google/protobuf/unittest_custom_options.proto
index 4cc0e362..218447e9 100644
--- a/src/google/protobuf/unittest_custom_options.proto
+++ b/src/google/protobuf/unittest_custom_options.proto
@@ -69,6 +69,10 @@ extend google.protobuf.FieldOptions {
   optional int32 field_opt2 = 7753913 [default=42];
 }
 
+extend google.protobuf.OneofOptions {
+  optional int32 oneof_opt1 = 7740111;
+}
+
 extend google.protobuf.EnumOptions {
   optional sfixed32 enum_opt1 = 7753576;
 }
@@ -100,6 +104,11 @@ message TestMessageWithCustomOptions {
   optional string field1 = 1 [ctype=CORD,
                               (field_opt1)=8765432109];
 
+  oneof AnOneof {
+    option (oneof_opt1) = -99;
+    int32 oneof_field = 2;
+  }
+
   enum AnEnum {
     option (enum_opt1) = -789;
 
-- 
cgit v1.2.3