aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-02-18 13:58:26 -0800
committerJisi Liu <jisi.liu@gmail.com>2015-02-19 16:43:08 -0800
commit3ab660cd4a5e1249553ad49a94ba1eaf2798d0ac (patch)
tree8716bc9573f8f6e92f7396b81c8ec663ea71404f
parent3accf81ea9c83980ced2c1901c58f4bed44003f4 (diff)
downloadprotobuf-3ab660cd4a5e1249553ad49a94ba1eaf2798d0ac.tar.gz
protobuf-3ab660cd4a5e1249553ad49a94ba1eaf2798d0ac.tar.bz2
protobuf-3ab660cd4a5e1249553ad49a94ba1eaf2798d0ac.zip
Uncomment string/bytes fields in oneof nano.
-rw-r--r--javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto4
1 files changed, 2 insertions, 2 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
index 842959a7..82d3374a 100644
--- a/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
+++ b/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
@@ -171,8 +171,8 @@ message TestAllTypesNano {
oneof oneof_field {
uint32 oneof_uint32 = 111;
NestedMessage oneof_nested_message = 112;
- // string oneof_string = 123;
- // bytes oneof_bytes = 124;
+ string oneof_string = 123;
+ bytes oneof_bytes = 124;
fixed64 oneof_fixed64 = 115;
}
}