diff options
| author | Jisi Liu <liujisi@google.com> | 2016-05-10 17:35:08 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-05-10 17:35:08 -0700 |
| commit | c67879b9fa6679890020cccdbc4bd572b0658d5c (patch) | |
| tree | 1f8fe93132f42a16f9be376b92cf309c9ad47b54 | |
| parent | cdd3ec7c2f1dd505ebbf49b49e1c4d7c084b5f79 (diff) | |
| parent | e8737d86764108c18f8fe7c577c5dddf692962a1 (diff) | |
| download | protobuf-c67879b9fa6679890020cccdbc4bd572b0658d5c.tar.gz protobuf-c67879b9fa6679890020cccdbc4bd572b0658d5c.tar.bz2 protobuf-c67879b9fa6679890020cccdbc4bd572b0658d5c.zip | |
Merge pull request #1514 from pherl/fix_heap_check
Fix the command line interface unittest again
| -rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index ae2900b1..9b504d25 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -65,13 +65,14 @@ #include <gtest/gtest.h> -// Disable the whole test when we use tcmalloc for "draconian" heap checks, in -// which case tcmalloc will print warnings that fail the plugin tests. -#if !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN namespace google { namespace protobuf { namespace compiler { +// Disable the whole test when we use tcmalloc for "draconian" heap checks, in +// which case tcmalloc will print warnings that fail the plugin tests. +#if !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN + #if defined(_WIN32) #ifndef STDIN_FILENO #define STDIN_FILENO 0 |