aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jie Luo <anandolee@gmail.com>2015-05-01 10:12:54 -0700
committerGravatar Jie Luo <anandolee@gmail.com>2015-05-01 10:12:54 -0700
commit41c175e7115fca70bcfdcd8b333bd07b58fd874f (patch)
treeeace388093b970d65ac3cf03b2a64ecaa8b8cdff
parent3d4b761998e7e54b81fff16d0459febfa77326c5 (diff)
Change field_presence_test.proto
-rw-r--r--csharp/protos/google/protobuf/field_presence_test.proto5
-rw-r--r--csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs3
2 files changed, 2 insertions, 6 deletions
diff --git a/csharp/protos/google/protobuf/field_presence_test.proto b/csharp/protos/google/protobuf/field_presence_test.proto
index 41a9a5cc..14d91312 100644
--- a/csharp/protos/google/protobuf/field_presence_test.proto
+++ b/csharp/protos/google/protobuf/field_presence_test.proto
@@ -2,10 +2,7 @@ syntax = "proto3";
package Google.ProtocolBuffers.TestProtos.FieldPresence;
-option java_package = "com.google.protobuf";
-option java_outer_classname = "FieldPresenceTestProto";
-option java_generate_equals_and_hash = true;
-
+// TODO(jieluo): Add repeated fields, oneof, maps to TestAllTypes
message TestAllTypes {
enum NestedEnum {
FOO = 0;
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
index a32630ed..b4cb279d 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
@@ -41,8 +41,7 @@ namespace Google.ProtocolBuffers.TestProtos.FieldPresence {
"c3NhZ2UYBSABKAsySy5Hb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90",
"b3MuRmllbGRQcmVzZW5jZS5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZRoe",
"Cg1OZXN0ZWRNZXNzYWdlEg0KBXZhbHVlGAEgASgFIicKCk5lc3RlZEVudW0S",
- "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJCMAoTY29tLmdvb2dsZS5wcm90",
- "b2J1ZkIWRmllbGRQcmVzZW5jZVRlc3RQcm90b6ABAWIGcHJvdG8z"));
+ "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJiBnByb3RvMw=="));
pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
descriptor = root;
internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor = Descriptor.MessageTypes[0];