diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 20:53:19 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 20:53:19 -0700 |
| commit | 01e060f20e7bafec3a073b7d41ad4c29a882b42b (patch) | |
| tree | 6c2f920ec6972b75b40d12be335fcd05992d65b0 | |
| parent | 5da0b46811a103bd1a953f496d4bcd5ff45d3736 (diff) | |
| download | protobuf-01e060f20e7bafec3a073b7d41ad4c29a882b42b.tar.gz protobuf-01e060f20e7bafec3a073b7d41ad4c29a882b42b.tar.bz2 protobuf-01e060f20e7bafec3a073b7d41ad4c29a882b42b.zip | |
Fix commandline interface file under heapcheck.
The internal down-integrate script probably does not handle the
top level macros well. Moved the macro inside of the namespace
declrations to avoid down-integrate errors in the future.
Change-Id: I3790357f36b0204a2a26577805192a3a1e989df8
| -rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 46ea5c4e..9560d0e0 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -63,13 +63,13 @@ #include <google/protobuf/testing/googletest.h> #include <gtest/gtest.h> +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 -namespace google { -namespace protobuf { -namespace compiler { #if defined(_WIN32) #ifndef STDIN_FILENO @@ -1800,8 +1800,8 @@ TEST_F(EncodeDecodeTest, ProtoParseError) { } // anonymous namespace +#endif // !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN + } // namespace compiler } // namespace protobuf - -#endif // !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN } // namespace google |