diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-05 02:54:43 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-05 02:54:43 -0800 |
| commit | be20ae0b6975071563ecc61f8372fd7936f174ed (patch) | |
| tree | ed4c27622fceb78410c74af287532379f475843e /src/google/protobuf/preserve_unknown_enum_test.cc | |
| parent | 7c939bcb25bff016ca63669c203e2ebfc0834825 (diff) | |
| download | protobuf-be20ae0b6975071563ecc61f8372fd7936f174ed.tar.gz protobuf-be20ae0b6975071563ecc61f8372fd7936f174ed.tar.bz2 protobuf-be20ae0b6975071563ecc61f8372fd7936f174ed.zip | |
Fix compile issues and test failures in VS2008.
Diffstat (limited to 'src/google/protobuf/preserve_unknown_enum_test.cc')
| -rw-r--r-- | src/google/protobuf/preserve_unknown_enum_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/preserve_unknown_enum_test.cc b/src/google/protobuf/preserve_unknown_enum_test.cc index 33e9ea10..816e52ca 100644 --- a/src/google/protobuf/preserve_unknown_enum_test.cc +++ b/src/google/protobuf/preserve_unknown_enum_test.cc @@ -200,6 +200,7 @@ TEST(PreserveUnknownEnumTest, Proto2CatchesUnknownValues) { EXPECT_TRUE(enum_value != NULL); r->AddEnum(&message, repeated_field, enum_value); +#ifdef PROTOBUF_HAS_DEATH_TEST // Enum-field integer-based setters GOOGLE_DCHECK-fail on invalid values, in order to // remain consistent with proto2 generated code. EXPECT_DEBUG_DEATH({ @@ -214,6 +215,7 @@ TEST(PreserveUnknownEnumTest, Proto2CatchesUnknownValues) { r->AddEnumValue(&message, repeated_field, 4242); r->GetRepeatedEnum(message, repeated_field, 1); }, "AddEnumValue accepts only valid integer values"); +#endif // PROTOBUF_HAS_DEATH_TEST } TEST(PreserveUnknownEnumTest, SupportsUnknownEnumValuesAPI) { |