diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 05:54:48 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 05:54:48 +0000 |
| commit | f5d5b4de92710812929d9c82250959cb73daa11b (patch) | |
| tree | 82cfdc5cb6ad8c84f50923f7826aca618034c4e8 /src/google/protobuf/io/printer_unittest.cc | |
| parent | e34f1f63b6080c5966559a7a09e90eb05d15cefc (diff) | |
Make custom option able to work for -f-no-rtti; Fix remaining death tests for gtest 1.6
Diffstat (limited to 'src/google/protobuf/io/printer_unittest.cc')
| -rw-r--r-- | src/google/protobuf/io/printer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/io/printer_unittest.cc b/src/google/protobuf/io/printer_unittest.cc index 399395c8..c9b30359 100644 --- a/src/google/protobuf/io/printer_unittest.cc +++ b/src/google/protobuf/io/printer_unittest.cc @@ -220,7 +220,7 @@ TEST(Printer, Indenting) { } // Death tests do not work on Windows as of yet. -#ifdef GTEST_HAS_DEATH_TEST +#ifdef PROTOBUF_HAS_DEATH_TEST TEST(Printer, Death) { char buffer[8192]; @@ -231,7 +231,7 @@ TEST(Printer, Death) { EXPECT_DEBUG_DEATH(printer.Print("$unclosed"), "Unclosed variable name"); EXPECT_DEBUG_DEATH(printer.Outdent(), "without matching Indent"); } -#endif // GTEST_HAS_DEATH_TEST +#endif // PROTOBUF__HAS_DEATH_TEST TEST(Printer, WriteFailurePartial) { char buffer[17]; |