Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Work around Boost having moved stuff around, fixes #20

Browse Source
This commit is contained in:
Timmy Sjöstedt 2016-05-19 22:09:08 +02:00
parent 8ede36c59d
commit b8062714a9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_globals.hpp
View File

@ -12,7 +12,17 @@
std::ostream& operator<<( std::ostream& stream, glm::vec3 const& v ); std::ostream& operator<<( std::ostream& stream, glm::vec3 const& v );
namespace boost { namespace test_tools { // Boost moved the print_log_value struct in version 1.59
// TODO: use another testing library
#if BOOST_VERSION >= 105900
#define BOOST_NS_MAGIC namespace tt_detail {
#define BOOST_NS_MAGIC_CLOSING }
#else
#define BOOST_NS_MAGIC
#define BOOST_NS_MAGIC_CLOSING
#endif
namespace boost { namespace test_tools { BOOST_NS_MAGIC
template<> template<>
struct print_log_value<glm::vec3> { struct print_log_value<glm::vec3> {
void operator()( std::ostream& s , glm::vec3 const& v ) void operator()( std::ostream& s , glm::vec3 const& v )
@ -20,9 +30,9 @@ struct print_log_value<glm::vec3> {
s << glm::to_string(v); s << glm::to_string(v);
} }
}; };
}} }} BOOST_NS_MAGIC_CLOSING
namespace boost { namespace test_tools { namespace boost { namespace test_tools { BOOST_NS_MAGIC
template<> template<>
struct print_log_value<std::nullptr_t> { struct print_log_value<std::nullptr_t> {
void operator()( std::ostream& s , std::nullptr_t ) void operator()( std::ostream& s , std::nullptr_t )
@ -30,7 +40,10 @@ struct print_log_value<std::nullptr_t> {
s << "nullptr"; s << "nullptr";
} }
}; };
}} }} BOOST_NS_MAGIC_CLOSING
#undef BOOST_NS_MAGIC
#undef BOOST_NS_MAGIC_CLOSING
class Global class Global
{ {