Revert "QA: Tweak boost print helper macro"
This reverts commit 593b7cd6a1
.
This causes breakage on MSVC. I am not sure sure why, but
this is not that important, so just back it out.
This commit is contained in:
parent
924736c6f3
commit
3afea91088
|
@ -223,7 +223,7 @@ inline SHAPE_POLY_SET FilletPolySet( SHAPE_POLY_SET& aPolySet, int aRadius, int
|
||||||
|
|
||||||
} // namespace GEOM_TEST
|
} // namespace GEOM_TEST
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
template <>
|
template <>
|
||||||
struct print_log_value<SHAPE_LINE_CHAIN>
|
struct print_log_value<SHAPE_LINE_CHAIN>
|
||||||
|
|
|
@ -67,7 +67,7 @@ bool IsImagePixelOfColor( const wxImage& aImage, int aX, int aY, const KIGFX::CO
|
||||||
} // namespace KI_TEST
|
} // 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 )
|
void print_log_value<wxImage>::operator()( std::ostream& os, wxImage const& aImage )
|
||||||
{
|
{
|
||||||
|
|
|
@ -46,7 +46,7 @@ bool IsImagePixelOfColor( const wxImage& aImage, int aX, int aY, const KIGFX::CO
|
||||||
} // namespace KI_TEST
|
} // namespace KI_TEST
|
||||||
|
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
template <>
|
template <>
|
||||||
struct print_log_value<wxImage>
|
struct print_log_value<wxImage>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <template_fieldnames.h>
|
#include <template_fieldnames.h>
|
||||||
|
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
template <>
|
template <>
|
||||||
struct print_log_value<LIB_FIELD>
|
struct print_log_value<LIB_FIELD>
|
||||||
|
|
|
@ -224,7 +224,7 @@ inline bool SexprConvertsToString( const SEXPR::SEXPR& aSexpr, const std::string
|
||||||
|
|
||||||
} // namespace KI_TEST
|
} // namespace KI_TEST
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
*/
|
*/
|
||||||
#if BOOST_VERSION >= 105900
|
#if BOOST_VERSION >= 105900
|
||||||
#define BOOST_TEST_PRINT_NAMESPACE_OPEN \
|
#define BOOST_TEST_PRINT_NAMESPACE_OPEN \
|
||||||
boost \
|
namespace boost \
|
||||||
{ \
|
{ \
|
||||||
namespace test_tools \
|
namespace test_tools \
|
||||||
{ \
|
{ \
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
#define BOOST_TEST_PRINT_NAMESPACE_CLOSE }}
|
#define BOOST_TEST_PRINT_NAMESPACE_CLOSE }}
|
||||||
#else
|
#else
|
||||||
#define BOOST_TEST_PRINT_NAMESPACE_OPEN \
|
#define BOOST_TEST_PRINT_NAMESPACE_OPEN \
|
||||||
boost \
|
namespace boost \
|
||||||
{ \
|
{ \
|
||||||
namespace test_tools
|
namespace test_tools
|
||||||
#define BOOST_TEST_PRINT_NAMESPACE_CLOSE }
|
#define BOOST_TEST_PRINT_NAMESPACE_CLOSE }
|
||||||
|
@ -118,7 +118,7 @@
|
||||||
*/
|
*/
|
||||||
#if BOOST_VERSION < 106400
|
#if BOOST_VERSION < 106400
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
template <>
|
template <>
|
||||||
struct print_log_value<std::nullptr_t>
|
struct print_log_value<std::nullptr_t>
|
||||||
|
@ -134,7 +134,7 @@ BOOST_TEST_PRINT_NAMESPACE_CLOSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include <unit_test_utils/unit_test_utils.h>
|
#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 )
|
void print_log_value<wxPoint>::operator()( std::ostream& os, wxPoint const& aPt )
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
||||||
namespace BOOST_TEST_PRINT_NAMESPACE_OPEN
|
BOOST_TEST_PRINT_NAMESPACE_OPEN
|
||||||
{
|
{
|
||||||
template <>
|
template <>
|
||||||
struct print_log_value<DOUBLET>
|
struct print_log_value<DOUBLET>
|
||||||
|
|
Loading…
Reference in New Issue