From c30fabf98f68039b698e2e4417e281b881150cde Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sun, 30 Aug 2015 17:13:36 +0900 Subject: [PATCH] Apply 7fdb320 change into C++98 interface. --- include/boost/fusion/container/deque/detail/cpp03/deque.hpp | 4 +++- test/Jamfile | 2 +- test/sequence/deque_is_constructible.cpp | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp index db8a967a..a65fa4ac 100644 --- a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp +++ b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp @@ -101,7 +101,9 @@ namespace boost { namespace fusion { template BOOST_FUSION_GPU_ENABLED - deque(Sequence const& seq, typename disable_if >::type* /*dummy*/ = 0) + deque(Sequence const& seq + , typename disable_if >::type* /*dummy*/ = 0 + , typename enable_if >::type* /*dummy*/ = 0) : base(base::from_iterator(fusion::begin(seq))) {} diff --git a/test/Jamfile b/test/Jamfile index fbfea3c9..8f290165 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -92,7 +92,7 @@ project [ run sequence/deque_copy.cpp : : : : ] [ run sequence/deque_iterator.cpp : : : : ] [ run sequence/deque_hash.cpp : : : : ] - [ run sequence/deque_is_constructible.cpp : : : : ] + [ compile sequence/deque_is_constructible.cpp : : : : ] [ run sequence/deque_make.cpp : : : : ] [ run sequence/deque_misc.cpp : : : : ] [ run sequence/deque_move.cpp : : : : ] diff --git a/test/sequence/deque_is_constructible.cpp b/test/sequence/deque_is_constructible.cpp index e7499363..e08b4787 100644 --- a/test/sequence/deque_is_constructible.cpp +++ b/test/sequence/deque_is_constructible.cpp @@ -5,6 +5,9 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ +#include + +#ifndef BOOST_NO_CXX11_HDR_TYPE_TRAITS #include #include @@ -14,4 +17,5 @@ struct Dummy { }; // Make sure deque's constructor is SFINAE-friendly. static_assert(!std::is_constructible, Dummy const&>::value, ""); -int main() { } +#endif +