Merge remote-tracking branch 'origin/develop' into feature/constexpr

2015-03-04 02:20:52 +09:00
parent 2114bfca6c 3e66a56b9f
commit f45c94fa43
88 changed files with 1904 additions and 530 deletions
--- a/include/boost/fusion/container/deque/detail/keyed_element.hpp
+++ b/include/boost/fusion/container/deque/detail/keyed_element.hpp
@@ -66,7 +66,8 @@ namespace boost { namespace fusion { namespace detail

        template <typename U, typename Rst>
        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        keyed_element(keyed_element<Key, U, Rst> const& rhs)
+        keyed_element(keyed_element<Key, U, Rst> const& rhs
+          , typename enable_if<is_convertible<U, Value> >::type* = 0)
          : Rest(rhs.get_base()), value_(rhs.value_)
        {}