diff options
| author | Jisi Liu <liujisi@google.com> | 2015-08-25 21:11:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-08-25 21:11:58 -0700 |
| commit | 06c9dfd9a3a6fd18604134c03250734c8d33732d (patch) | |
| tree | db4b741a8c0efea6c7aaf0e11fad3fae87b69c2e | |
| parent | b192ba87f72b5e3e8add09bbcbb7623831e3079b (diff) | |
| parent | 01e060f20e7bafec3a073b7d41ad4c29a882b42b (diff) | |
| download | protobuf-06c9dfd9a3a6fd18604134c03250734c8d33732d.tar.gz protobuf-06c9dfd9a3a6fd18604134c03250734c8d33732d.tar.bz2 protobuf-06c9dfd9a3a6fd18604134c03250734c8d33732d.zip | |
Merge pull request #740 from pherl/beta-1
Fix commandline interface file under heapcheck.
| -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 |