aboutsummaryrefslogtreecommitdiff
path: root/ruby/ext/google/protobuf_c/protobuf.c
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2015-02-02 13:29:15 -0800
committerJoshua Haberman <jhaberman@gmail.com>2015-02-02 13:29:15 -0800
commit17e4419188e5873c43d462d493fcbb2cc668aa71 (patch)
tree467caa69558129b90c56ea9fd971ce51c496747d /ruby/ext/google/protobuf_c/protobuf.c
parent8ccaa42ffbe020f3d74ec90e954dd45a27ec32c6 (diff)
parenta3953da536751f2a77de0553b566bde5e8b5aa1e (diff)
downloadprotobuf-17e4419188e5873c43d462d493fcbb2cc668aa71.tar.gz
protobuf-17e4419188e5873c43d462d493fcbb2cc668aa71.tar.bz2
protobuf-17e4419188e5873c43d462d493fcbb2cc668aa71.zip
Merge pull request #168 from cfallin/ruby-oneof
Support oneofs in MRI Ruby C extension.
Diffstat (limited to 'ruby/ext/google/protobuf_c/protobuf.c')
-rw-r--r--ruby/ext/google/protobuf_c/protobuf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ruby/ext/google/protobuf_c/protobuf.c b/ruby/ext/google/protobuf_c/protobuf.c
index 30552705..d2d35033 100644
--- a/ruby/ext/google/protobuf_c/protobuf.c
+++ b/ruby/ext/google/protobuf_c/protobuf.c
@@ -77,8 +77,10 @@ void Init_protobuf_c() {
DescriptorPool_register(protobuf);
Descriptor_register(protobuf);
FieldDescriptor_register(protobuf);
+ OneofDescriptor_register(protobuf);
EnumDescriptor_register(protobuf);
MessageBuilderContext_register(internal);
+ OneofBuilderContext_register(internal);
EnumBuilderContext_register(internal);
Builder_register(internal);
RepeatedField_register(protobuf);