Merging 77932-78199 from trunk

[SVN r78200]
This commit is contained in:
Joel de Guzman
2012-04-26 00:18:51 +00:00
parent b159898a47
commit 93477e270e
14 changed files with 281 additions and 127 deletions

View File

@@ -8,9 +8,7 @@
#if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330)
#define BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/next.hpp>
@@ -59,17 +57,17 @@ namespace detail {
return *this;
}
typename add_reference<typename add_const<Value>::type>::type get(Key) const
typename cref_result<Value>::type get(Key) const
{
return value_;
}
typename add_reference<Value>::type get(Key)
typename ref_result<Value>::type get(Key)
{
return value_;
}
keyed_element(typename add_reference<typename add_const<Value>::type>::type value, Rest const& rest)
keyed_element(typename call_param<Value>::type value, Rest const& rest)
: Rest(rest), value_(value)
{}