diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-28 16:40:39 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-28 16:40:39 -0800 |
| commit | c5147e3d51ab871393d407195fb6fe8502517ce3 (patch) | |
| tree | b0be2acbc999cbbd0a464d0451b4d5f676e5b87d | |
| parent | 9dcd24df107c52a2c82ad25e528fa24eb24680d5 (diff) | |
| download | protobuf-c5147e3d51ab871393d407195fb6fe8502517ce3.tar.gz protobuf-c5147e3d51ab871393d407195fb6fe8502517ce3.tar.bz2 protobuf-c5147e3d51ab871393d407195fb6fe8502517ce3.zip | |
Fix a misplaced macro.
Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d
| -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 4ce81a75..dda007d4 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 @@ -1822,8 +1822,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 |