haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qa test: fix a compil issue by modifying the way BOOST_PRINT namespace is used in geometry.h" 

This reverts commit bd4222cc84.

the commit bd4222cc did not fix compil issues with some compilers
This commit is contained in:
jean-pierre charras 2019-01-11 16:53:16 +01:00
parent 644855c5ba
commit bac31d0911
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/unit_test_utils/include/unit_test_utils/geometry.h
View File

@ -8,20 +8,17 @@
#include <math/box2.h> #include <math/box2.h>
#include <math/vector2d.h> #include <math/vector2d.h>
/** /**
* Printer for BOX2I type * Printer for BOX2I type
*/ */
namespace BOOST_PRINT_NAMESPACE template <> struct BOOST_PRINT::print_log_value<BOX2I>
{
template <> struct print_log_value<BOX2I>
{ {
void operator()( std::ostream& os, const BOX2I& aBox ) void operator()( std::ostream& os, const BOX2I& aBox )
{ {
os << "BOX[ " << aBox.GetOrigin() << " + " << aBox.GetSize() << " ]"; os << "BOX[ " << aBox.GetOrigin() << " + " << aBox.GetSize() << " ]";
} }
}; };
} // namespace BOOST_PRINT_NAMESPACE
namespace KI_TEST namespace KI_TEST
{ {

11
qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
View File

@ -81,15 +81,12 @@
* Define a helper to make it easier to use the right namespace for * Define a helper to make it easier to use the right namespace for
* defining the print helpers like this: * defining the print helpers like this:
* *
* namespace BOOST_PRINT_NAMESPACE * template<>
* { * struct BOOST_PRINT::print_log_value< MY_TYPE >
* template<>
* struct print_log_value< MY_TYPE >
* }
*/ */
#if BOOST_VERSION < 105900 #if BOOST_VERSION < 105900
#define BOOST_PRINT_NAMESPACE boost::test_tools namespace BOOST_PRINT = boost::test_tools;
#else #else
#define BOOST_PRINT_NAMESPACE boost::test_tools::tt_detail namespace BOOST_PRINT = boost::test_tools::tt_detail;
#endif #endif
#endif // UNIT_TEST_UTILS__H #endif // UNIT_TEST_UTILS__H