mirror of
https://github.com/rwengine/openrw.git
synced 2024-09-15 06:52:34 +02:00
tests: boost 1.64 has a print_log_value<nullptr_t> implementation
fixes: error C2766: explicit specialization; 'boost::test_tools::tt_detail::print_log_value<std::nullptr_t>' has already been defined C:\Boost\include\boost-1_64\boost/test/tools/detail/print_helper.hpp(169): note: see previous definition of 'print_log_value<std::nullptr_t>
This commit is contained in:
parent
57284fdade
commit
4dc7da89ad
@ -90,11 +90,11 @@ endif()
|
|||||||
|
|
||||||
if(TEST_COVERAGE)
|
if(TEST_COVERAGE)
|
||||||
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
message("Test Coverage enabled. Setting CMAKE_BUILD_TYPE to Debug.")
|
message("TEST_COVERAGE enabled. Setting CMAKE_BUILD_TYPE to Debug.")
|
||||||
set(CMAKE_BUILD_TYPE "Debug")
|
set(CMAKE_BUILD_TYPE "Debug")
|
||||||
endif()
|
endif()
|
||||||
if(NOT BUILD_TESTS)
|
if(NOT BUILD_TESTS)
|
||||||
message("TestCoverage enabled. Enabling BUILD_TESTS.")
|
message("TEST_COVERAGE enabled. Enabling BUILD_TESTS.")
|
||||||
set(BUILD_TESTS "ON")
|
set(BUILD_TESTS "ON")
|
||||||
endif()
|
endif()
|
||||||
target_compile_options(rw_interface
|
target_compile_options(rw_interface
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef _TESTGLOBABLS_HPP_
|
#ifndef _TESTGLOBALS_HPP_
|
||||||
#define _TESTGLOBABLS_HPP_
|
#define _TESTGLOBALS_HPP_
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
#include <GameWindow.hpp>
|
#include <GameWindow.hpp>
|
||||||
@ -31,10 +31,11 @@ struct print_log_value<glm::vec3> {
|
|||||||
s << glm::to_string(v);
|
s << glm::to_string(v);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
BOOST_NS_MAGIC_CLOSING
|
BOOST_NS_MAGIC_CLOSING
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if BOOST_VERSION < 106400
|
||||||
namespace boost {
|
namespace boost {
|
||||||
namespace test_tools {
|
namespace test_tools {
|
||||||
BOOST_NS_MAGIC
|
BOOST_NS_MAGIC
|
||||||
@ -44,9 +45,10 @@ struct print_log_value<std::nullptr_t> {
|
|||||||
s << "nullptr";
|
s << "nullptr";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
BOOST_NS_MAGIC_CLOSING
|
BOOST_NS_MAGIC_CLOSING
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace boost {
|
namespace boost {
|
||||||
namespace test_tools {
|
namespace test_tools {
|
||||||
@ -59,9 +61,9 @@ struct print_log_value<GameString> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
BOOST_NS_MAGIC_CLOSING
|
BOOST_NS_MAGIC_CLOSING
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#undef BOOST_NS_MAGIC
|
#undef BOOST_NS_MAGIC
|
||||||
#undef BOOST_NS_MAGIC_CLOSING
|
#undef BOOST_NS_MAGIC_CLOSING
|
||||||
|
Loading…
Reference in New Issue
Block a user