diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:33:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:36:09 +0900 |
| commit | d9ec475d945d3035377a0d89ed42e382d8988891 (patch) | |
| tree | 34aff2cee4b209906243ab5499d61f3edee2982f /boost/test/test_tools.hpp | |
| parent | 71d216b90256936a9638f325af9bc69d720e75de (diff) | |
| download | boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.gz boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.bz2 boost-d9ec475d945d3035377a0d89ed42e382d8988891.zip | |
Imported Upstream version 1.60.0
Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/test/test_tools.hpp')
| -rw-r--r-- | boost/test/test_tools.hpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/boost/test/test_tools.hpp b/boost/test/test_tools.hpp index dea2b20fa2..a542d5fcde 100644 --- a/boost/test/test_tools.hpp +++ b/boost/test/test_tools.hpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2014. +// (C) Copyright Gennadiy Rozental 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,16 +15,24 @@ #define BOOST_TEST_TOOLS_HPP_111812GER #include <boost/config.hpp> + +// brings some compiler configuration like BOOST_PP_VARIADICS +#include <boost/test/detail/config.hpp> + #include <boost/preprocessor/config/config.hpp> -#if !BOOST_PP_VARIADICS || ((__cplusplus >= 201103L) && defined(BOOST_NO_CXX11_VARIADIC_MACROS)) -#define BOOST_TEST_NO_VARIADIC +#if defined(BOOST_NO_CXX11_VARIADIC_MACROS) \ + || defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) \ + || defined(BOOST_NO_CXX11_DECLTYPE) +# define BOOST_TEST_MACRO_LIMITED_SUPPORT #endif // Boost.Test // #define BOOST_TEST_NO_OLD_TOOLS -#if defined(BOOST_TEST_NO_VARIADIC) +#if defined(BOOST_TEST_MACRO_LIMITED_SUPPORT) \ + && ( !BOOST_PP_VARIADICS \ + || !(__cplusplus >= 201103L) && defined(BOOST_NO_CXX11_VARIADIC_MACROS)) # define BOOST_TEST_NO_NEW_TOOLS #endif @@ -57,5 +65,4 @@ # include <boost/test/tools/detail/lexicographic_manip.hpp> #endif - #endif // BOOST_TEST_TOOLS_HPP_111812GER |