Reinstate "QA: Tweak boost print helper macro""

This reverts commit 3afea91088. This was actually not the issue, even though it seemed to trigger the issue.
6 years ago · 2ec4ceffbd
8 changed files with 11 additions and 11 deletions
--- 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

-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<SHAPE_LINE_CHAIN>
--- 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


-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 void print_log_value<wxImage>::operator()( std::ostream& os, wxImage const& aImage )
 {
--- 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


-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<wxImage>
--- a/qa/eeschema/lib_field_test_utils.h
+++ b/qa/eeschema/lib_field_test_utils.h
@ -35,7 +35,7 @@
 #include <template_fieldnames.h>


-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<LIB_FIELD>
--- 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

-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {

 /**
--- 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 \
-    namespace boost                     \
+    boost                               \
    {                                   \
    namespace test_tools                \
    {                                   \
@ -104,7 +104,7 @@
 #define BOOST_TEST_PRINT_NAMESPACE_CLOSE }}
 #else
 #define BOOST_TEST_PRINT_NAMESPACE_OPEN \
-    namespace boost                     \
+    boost                               \
    {                                   \
    namespace test_tools
 #define BOOST_TEST_PRINT_NAMESPACE_CLOSE }
@ -118,7 +118,7 @@
 */
 #if BOOST_VERSION < 106400

-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<std::nullptr_t>
@ -134,7 +134,7 @@ BOOST_TEST_PRINT_NAMESPACE_CLOSE
 #endif


-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {

 /**
--- 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>

-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {

 void print_log_value<wxPoint>::operator()( std::ostream& os, wxPoint const& aPt )
--- a/qa/utils/kicad2step/pcb/test_base.cpp
+++ b/qa/utils/kicad2step/pcb/test_base.cpp
@ -36,7 +36,7 @@
 #include <cmath>


-BOOST_TEST_PRINT_NAMESPACE_OPEN
+namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
 {
 template <>
 struct print_log_value<DOUBLET>