From c5147e3d51ab871393d407195fb6fe8502517ce3 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Mon, 28 Dec 2015 16:40:39 -0800 Subject: Fix a misplaced macro. Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d --- .../protobuf/compiler/command_line_interface_unittest.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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 #include +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 -- cgit v1.2.3