update boost
This commit is contained in:
@@ -16,8 +16,9 @@
|
||||
#include <boost/config.hpp> // compilers workarounds
|
||||
#include <boost/detail/workaround.hpp>
|
||||
|
||||
#if defined(_WIN32) && !defined(BOOST_DISABLE_WIN32) && \
|
||||
(!defined(__COMO__) && !defined(__MWERKS__) && !defined(__GNUC__) || \
|
||||
#if defined(_WIN32) && !defined(BOOST_DISABLE_WIN32) && \
|
||||
(!defined(__COMO__) && !defined(__MWERKS__) && \
|
||||
!defined(__GNUC__) && !defined(BOOST_EMBTC) || \
|
||||
BOOST_WORKAROUND(__MWERKS__, >= 0x3000))
|
||||
# define BOOST_SEH_BASED_SIGNAL_HANDLING
|
||||
#endif
|
||||
@@ -30,7 +31,7 @@ class type_info;
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) || \
|
||||
#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570)) || \
|
||||
BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) || \
|
||||
(defined __sgi && BOOST_WORKAROUND(_COMPILER_VERSION, BOOST_TESTED_AT(730)))
|
||||
# define BOOST_TEST_SHIFTED_LINE
|
||||
@@ -52,7 +53,7 @@ class type_info;
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x570) || \
|
||||
#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x570) || \
|
||||
BOOST_WORKAROUND( __COMO__, <= 0x433 ) || \
|
||||
BOOST_WORKAROUND( __INTEL_COMPILER, <= 800 ) || \
|
||||
defined(__sgi) && _COMPILER_VERSION <= 730 || \
|
||||
@@ -64,15 +65,15 @@ class type_info;
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
#if defined(__GNUC__) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
|
||||
#define BOOST_TEST_PROTECTED_VIRTUAL virtual
|
||||
#else
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1400)
|
||||
#define BOOST_TEST_PROTECTED_VIRTUAL
|
||||
#else
|
||||
#define BOOST_TEST_PROTECTED_VIRTUAL virtual
|
||||
#endif
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
#if !defined(__BORLANDC__) && !BOOST_WORKAROUND( __SUNPRO_CC, < 0x5100 )
|
||||
#if !defined(BOOST_BORLANDC) && !BOOST_WORKAROUND( __SUNPRO_CC, < 0x5100 )
|
||||
#define BOOST_TEST_SUPPORT_TOKEN_ITERATOR 1
|
||||
#endif
|
||||
|
||||
@@ -112,7 +113,11 @@ class type_info;
|
||||
# define BOOST_TEST_DECL BOOST_SYMBOL_IMPORT BOOST_SYMBOL_VISIBLE
|
||||
# endif // BOOST_TEST_SOURCE
|
||||
#else
|
||||
# define BOOST_TEST_DECL BOOST_SYMBOL_VISIBLE
|
||||
# if defined(BOOST_TEST_INCLUDED)
|
||||
# define BOOST_TEST_DECL
|
||||
# else
|
||||
# define BOOST_TEST_DECL BOOST_SYMBOL_VISIBLE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(BOOST_TEST_MAIN) && defined(BOOST_AUTO_TEST_MAIN)
|
||||
@@ -125,7 +130,7 @@ class type_info;
|
||||
|
||||
|
||||
|
||||
#ifndef BOOST_PP_VARIADICS /* we can change this only if not already defined) */
|
||||
#ifndef BOOST_PP_VARIADICS /* we can change this only if not already defined */
|
||||
|
||||
#ifdef __PGI
|
||||
#define BOOST_PP_VARIADICS 1
|
||||
@@ -139,6 +144,38 @@ class type_info;
|
||||
#define BOOST_PP_VARIADICS 1
|
||||
#endif
|
||||
|
||||
#if defined(__NVCC__)
|
||||
#define BOOST_PP_VARIADICS 1
|
||||
#endif
|
||||
|
||||
#endif /* ifndef BOOST_PP_VARIADICS */
|
||||
|
||||
// some versions of VC exibit a manifest error with this BOOST_UNREACHABLE_RETURN
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
|
||||
# define BOOST_TEST_UNREACHABLE_RETURN(x) return x
|
||||
#else
|
||||
# define BOOST_TEST_UNREACHABLE_RETURN(x) BOOST_UNREACHABLE_RETURN(x)
|
||||
#endif
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
// MSVC <= 12 and GCC <= 4.6 do not allow for defaulted destructors
|
||||
// See: https://github.com/boostorg/test/issues/385
|
||||
|
||||
#if (defined(BOOST_MSVC) && BOOST_MSVC < 1900) || (defined(BOOST_GCC) && BOOST_GCC < 40700)
|
||||
# define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) fun body
|
||||
#else
|
||||
# define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) BOOST_DEFAULTED_FUNCTION(fun, body);
|
||||
#endif
|
||||
|
||||
//____________________________________________________________________________//
|
||||
// string_view support
|
||||
//____________________________________________________________________________//
|
||||
// note the code should always be compatible with compiled version of boost.test
|
||||
// using a pre-c++17 compiler
|
||||
|
||||
#ifndef BOOST_NO_CXX17_HDR_STRING_VIEW
|
||||
#define BOOST_TEST_STRING_VIEW
|
||||
#endif
|
||||
|
||||
#endif // BOOST_TEST_CONFIG_HPP_071894GER
|
||||
|
||||
@@ -36,5 +36,6 @@
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wvariadic-macros"
|
||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||
// # pragma GCC diagnostic ignored "-Wattributes"
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user