Subject: [Boost-commit] svn:boost r78056 - trunk/boost/fusion/container/deque
From: joel_at_[hidden]
Date: 2012-04-17 21:18:12
Author: djowel
Date: 2012-04-17 21:18:10 EDT (Tue, 17 Apr 2012)
New Revision: 78056
URL: http://svn.boost.org/trac/boost/changeset/78056
Log:
deque fix for ambiguity and making ctors explicit
Text files modified:
trunk/boost/fusion/container/deque/cpp11_deque.hpp | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
Modified: trunk/boost/fusion/container/deque/cpp11_deque.hpp
==============================================================================
--- trunk/boost/fusion/container/deque/cpp11_deque.hpp (original)
+++ trunk/boost/fusion/container/deque/cpp11_deque.hpp 2012-04-17 21:18:10 EDT (Tue, 17 Apr 2012)
@@ -31,7 +31,9 @@
struct deque_tag;
template <typename ...Elements>
- struct deque;
+ struct deque : detail::nil_keyed_element
+ {
+ };
template <typename Head, typename ...Tail>
struct deque<Head, Tail...>
@@ -49,22 +51,18 @@
deque()
{}
- explicit deque(typename add_reference<typename add_const<Head>::type>::type elem)
- : base(elem, detail::nil_keyed_element())
- {}
-
template <typename ...Elements>
deque(deque<Elements...> const& seq)
: base(seq)
{}
- deque(typename add_reference<typename add_const<Head>::type>::type head
+ explicit deque(typename add_reference<typename add_const<Head>::type>::type head
, typename add_reference<typename add_const<Tail>::type>::type... tail)
: base(detail::deque_keyed_values<Head, Tail...>::call(head, tail...))
{}
template <typename Sequence>
- deque(Sequence const& seq
+ explicit deque(Sequence const& seq
, typename disable_if<is_convertible<Sequence, Head> >::type* /*dummy*/ = 0)
: base(base::from_iterator(fusion::begin(seq)))
{}