diff options
| author |  Bo Yang <teboring@google.com> | 2015-04-24 15:34:40 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-04-24 18:09:55 -0700 |
| commit | d6c9f644ac62ec83196a75a47655a33a87875628 (patch) | |
| tree | 742b0ab947ca26d5896c97e5909ca344bcc3ce3a /src/google/protobuf/preserve_unknown_enum_test.cc | |
| parent | fe7b5667eb446766a1c2f30c691662a36f3df1f8 (diff) | |
internal changes
Change-Id: I66f216c70a19f44637090878d7e442d4d0f8991b
Diffstat (limited to 'src/google/protobuf/preserve_unknown_enum_test.cc')
| -rw-r--r-- | src/google/protobuf/preserve_unknown_enum_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/preserve_unknown_enum_test.cc b/src/google/protobuf/preserve_unknown_enum_test.cc index 9f8703ae..1673e8af 100644 --- a/src/google/protobuf/preserve_unknown_enum_test.cc +++ b/src/google/protobuf/preserve_unknown_enum_test.cc @@ -246,8 +246,6 @@ TEST(PreserveUnknownEnumTest, Proto2CatchesUnknownValues) { protobuf_unittest::TestAllTypes message; // proto2 message const google::protobuf::Reflection* r = message.GetReflection(); const google::protobuf::Descriptor* d = message.GetDescriptor(); - const google::protobuf::FieldDescriptor* singular_field = - d->FindFieldByName("optional_nested_enum"); const google::protobuf::FieldDescriptor* repeated_field = d->FindFieldByName("repeated_nested_enum"); // Add one element to the repeated field so that we can test @@ -258,6 +256,8 @@ TEST(PreserveUnknownEnumTest, Proto2CatchesUnknownValues) { r->AddEnum(&message, repeated_field, enum_value); #ifdef PROTOBUF_HAS_DEATH_TEST + const google::protobuf::FieldDescriptor* singular_field = + d->FindFieldByName("optional_nested_enum"); // Enum-field integer-based setters GOOGLE_DCHECK-fail on invalid values, in order to // remain consistent with proto2 generated code. EXPECT_DEBUG_DEATH({ |