Merge pull request #404 from anandolee/master

Add oneof support for c#

1 files changed, 16 insertions, 0 deletions

diff --git a/csharp/src/ProtocolBuffers/GeneratedBuilder.cs b/csharp/src/ProtocolBuffers/GeneratedBuilder.cs
index e60a4201..0f121ae8 100644
--- a/csharp/src/ProtocolBuffers/GeneratedBuilder.cs
+++ b/csharp/src/ProtocolBuffers/GeneratedBuilder.cs
@@ -105,6 +105,16 @@ namespace Google.ProtocolBuffers
             set { InternalFieldAccessors[field].SetRepeated(ThisBuilder, index, value); }

         }

 

+        public override bool HasOneof(OneofDescriptor oneof)

+        {

+            return MessageBeingBuilt.HasOneof(oneof);

+        }

+

+        public override FieldDescriptor OneofFieldDescriptor(OneofDescriptor oneof)

+        {

+            return MessageBeingBuilt.OneofFieldDescriptor(oneof);

+        }

+

         public override bool HasField(FieldDescriptor field)

         {

             return MessageBeingBuilt.HasField(field);

@@ -121,6 +131,12 @@ namespace Google.ProtocolBuffers
             return ThisBuilder;

         }

 

+        public override TBuilder ClearOneof(OneofDescriptor oneof)

+        {

+            InternalFieldAccessors.Oneof(oneof).Clear(ThisBuilder);

+            return ThisBuilder;

+        }

+

         public override TBuilder MergeFrom(TMessage other)

         {

             if (other.DescriptorForType != InternalFieldAccessors.Descriptor)