diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-03-21 15:45:20 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-03-21 15:46:37 +0900 |
| commit | 733b5d5ae2c5d625211e2985ac25728ac3f54883 (patch) | |
| tree | a5b214744b256f07e1dc2bd7273035a7808c659f /boost/fusion/container/deque/deque_fwd.hpp | |
| parent | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (diff) | |
| download | boost-733b5d5ae2c5d625211e2985ac25728ac3f54883.tar.gz boost-733b5d5ae2c5d625211e2985ac25728ac3f54883.tar.bz2 boost-733b5d5ae2c5d625211e2985ac25728ac3f54883.zip | |
Imported Upstream version 1.58.0upstream/1.58.0
Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/fusion/container/deque/deque_fwd.hpp')
| -rw-r--r-- | boost/fusion/container/deque/deque_fwd.hpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/boost/fusion/container/deque/deque_fwd.hpp b/boost/fusion/container/deque/deque_fwd.hpp index 639c00e52d..ebbeb4c1d7 100644 --- a/boost/fusion/container/deque/deque_fwd.hpp +++ b/boost/fusion/container/deque/deque_fwd.hpp @@ -11,9 +11,8 @@ #include <boost/fusion/support/config.hpp> #include <boost/config.hpp> -#if (defined(BOOST_NO_CXX11_DECLTYPE) \ - || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \ - || defined(BOOST_NO_CXX11_RVALUE_REFERENCES)) \ +#if (defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \ + || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)) \ || (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)) # if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) # undef BOOST_FUSION_HAS_VARIADIC_DEQUE @@ -24,8 +23,15 @@ # endif #endif +// MSVC variadics at this point in time is not ready yet (ICE!) +#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900)) +# if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) +# undef BOOST_FUSION_HAS_VARIADIC_DEQUE +# endif +#endif + /////////////////////////////////////////////////////////////////////////////// -// With no decltype and variadics, we will use the C++03 version +// With no variadics, we will use the C++03 version /////////////////////////////////////////////////////////////////////////////// #if !defined(BOOST_FUSION_HAS_VARIADIC_DEQUE) # include <boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp> |