From 3afea91088274ebab574c8b915577093a765c541 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Thu, 23 May 2019 22:08:07 +0100
Subject: [PATCH] Revert "QA: Tweak boost print helper macro"

This reverts commit 593b7cd6a1c70a97d41b1d955ea38732e17b896c.

This causes breakage on MSVC. I am not sure sure why, but
this is not that important, so just back it out.
---
 qa/common/geometry/geom_test_utils.h                      | 2 +-
 qa/common/wximage_test_utils.cpp                          | 2 +-
 qa/common/wximage_test_utils.h                            | 2 +-
 qa/eeschema/lib_field_test_utils.h                        | 2 +-
 qa/libs/sexpr/sexpr_test_utils.h                          | 2 +-
 .../include/unit_test_utils/unit_test_utils.h             | 8 ++++----
 qa/unit_test_utils/unit_test_utils.cpp                    | 2 +-
 qa/utils/kicad2step/pcb/test_base.cpp                     | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qa/common/geometry/geom_test_utils.h b/qa/common/geometry/geom_test_utils.h
index b5024062f0..e658bb8ac8 100644
--- a/qa/common/geometry/geom_test_utils.h
+++ b/qa/common/geometry/geom_test_utils.h
@@ -223,7 +223,7 @@ inline SHAPE_POLY_SET FilletPolySet( SHAPE_POLY_SET& aPolySet, int aRadius, int
 
 } // namespace GEOM_TEST
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<SHAPE_LINE_CHAIN>
diff --git a/qa/common/wximage_test_utils.cpp b/qa/common/wximage_test_utils.cpp
index 13126a481d..bfdb16a509 100644
--- a/qa/common/wximage_test_utils.cpp
+++ b/qa/common/wximage_test_utils.cpp
@@ -67,7 +67,7 @@ bool IsImagePixelOfColor( const wxImage& aImage, int aX, int aY, const KIGFX::CO
 } // namespace KI_TEST
 
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 void print_log_value<wxImage>::operator()( std::ostream& os, wxImage const& aImage )
 {
diff --git a/qa/common/wximage_test_utils.h b/qa/common/wximage_test_utils.h
index eefc2976b9..b1bba34cab 100644
--- a/qa/common/wximage_test_utils.h
+++ b/qa/common/wximage_test_utils.h
@@ -46,7 +46,7 @@ bool IsImagePixelOfColor( const wxImage& aImage, int aX, int aY, const KIGFX::CO
 } // namespace KI_TEST
 
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<wxImage>
diff --git a/qa/eeschema/lib_field_test_utils.h b/qa/eeschema/lib_field_test_utils.h
index a24ccde28c..51288420fd 100644
--- a/qa/eeschema/lib_field_test_utils.h
+++ b/qa/eeschema/lib_field_test_utils.h
@@ -35,7 +35,7 @@
 #include <template_fieldnames.h>
 
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<LIB_FIELD>
diff --git a/qa/libs/sexpr/sexpr_test_utils.h b/qa/libs/sexpr/sexpr_test_utils.h
index 31c97f96a1..085baf5e2a 100644
--- a/qa/libs/sexpr/sexpr_test_utils.h
+++ b/qa/libs/sexpr/sexpr_test_utils.h
@@ -224,7 +224,7 @@ inline bool SexprConvertsToString( const SEXPR::SEXPR& aSexpr, const std::string
 
 } // namespace KI_TEST
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 
 /**
diff --git a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
index f6ca1ac403..1335197b00 100644
--- a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
+++ b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
@@ -96,7 +96,7 @@
  */
 #if BOOST_VERSION >= 105900
 #define BOOST_TEST_PRINT_NAMESPACE_OPEN \
-    boost                               \
+    namespace boost                     \
     {                                   \
     namespace test_tools                \
     {                                   \
@@ -104,7 +104,7 @@
 #define BOOST_TEST_PRINT_NAMESPACE_CLOSE }}
 #else
 #define BOOST_TEST_PRINT_NAMESPACE_OPEN \
-    boost                               \
+    namespace boost                     \
     {                                   \
     namespace test_tools
 #define BOOST_TEST_PRINT_NAMESPACE_CLOSE }
@@ -118,7 +118,7 @@
  */
 #if BOOST_VERSION < 106400
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<std::nullptr_t>
@@ -134,7 +134,7 @@ BOOST_TEST_PRINT_NAMESPACE_CLOSE
 #endif
 
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 
 /**
diff --git a/qa/unit_test_utils/unit_test_utils.cpp b/qa/unit_test_utils/unit_test_utils.cpp
index ef39ffe780..71550e564f 100644
--- a/qa/unit_test_utils/unit_test_utils.cpp
+++ b/qa/unit_test_utils/unit_test_utils.cpp
@@ -23,7 +23,7 @@
 
 #include <unit_test_utils/unit_test_utils.h>
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 
 void print_log_value<wxPoint>::operator()( std::ostream& os, wxPoint const& aPt )
diff --git a/qa/utils/kicad2step/pcb/test_base.cpp b/qa/utils/kicad2step/pcb/test_base.cpp
index 346b5ca1d9..0a853ca5e9 100644
--- a/qa/utils/kicad2step/pcb/test_base.cpp
+++ b/qa/utils/kicad2step/pcb/test_base.cpp
@@ -36,7 +36,7 @@
 #include <cmath>
 
 
-namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
+BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<DOUBLET>