boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-21 08:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

tweaked cref_result and ref_result to be non-lazy (for consistency).

Browse Source 
[SVN r78058]
This commit is contained in:
Joel de Guzman
2012-04-18 02:57:56 +00:00
parent c8224c8bdf
commit 01f002f084
10 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
View File

@ -9,7 +9,7 @@
#include <tuple> #include <tuple>
#include <utility> #include <utility>
#include <boost/mpl/eval_if.hpp> #include <boost/mpl/if.hpp>
#include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/detail/access.hpp>
#include <boost/type_traits/remove_const.hpp> #include <boost/type_traits/remove_const.hpp>
@ -29,13 +29,13 @@ namespace boost { namespace fusion
struct apply struct apply
{ {
typedef typename remove_const<Sequence>::type seq_type; typedef typename remove_const<Sequence>::type seq_type;
typedef std::tuple_element<N::value, seq_type> element; typedef typename std::tuple_element<N::value, seq_type>::type element;
typedef typename typedef typename
mpl::eval_if< mpl::if_<
is_const<Sequence> is_const<Sequence>
, fusion::detail::cref_result<element> , typename fusion::detail::cref_result<element>::type
, fusion::detail::ref_result<element> , typename fusion::detail::ref_result<element>::type
>::type >::type
type; type;

10
include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
View File

@ -12,7 +12,7 @@
#include <boost/type_traits/remove_const.hpp> #include <boost/type_traits/remove_const.hpp>
#include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/detail/access.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/eval_if.hpp> #include <boost/mpl/if.hpp>
#include <tuple> #include <tuple>
#include <utility> #include <utility>
@ -48,12 +48,12 @@ namespace boost { namespace fusion
template <typename Iterator> template <typename Iterator>
struct deref struct deref
{ {
typedef value_of<Iterator> element; typedef typename value_of<Iterator>::type element;
typedef typename typedef typename
mpl::eval_if< mpl::if_<
is_const<typename Iterator::tuple_type> is_const<typename Iterator::tuple_type>
, fusion::detail::cref_result<element> , typename fusion::detail::cref_result<element>::type
, fusion::detail::ref_result<element> , typename fusion::detail::ref_result<element>::type
>::type >::type
type; type;

5
include/boost/fusion/container/deque/cpp11_deque.hpp
View File

@ -13,6 +13,7 @@
#include <boost/type_traits/is_convertible.hpp> #include <boost/type_traits/is_convertible.hpp>
#include <boost/fusion/support/sequence_base.hpp> #include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/detail/access.hpp>
#include <boost/fusion/container/deque/detail/keyed_element.hpp> #include <boost/fusion/container/deque/detail/keyed_element.hpp>
#include <boost/fusion/container/deque/detail/cpp11_deque_keyed_values.hpp> #include <boost/fusion/container/deque/detail/cpp11_deque_keyed_values.hpp>
#include <boost/fusion/container/deque/deque_fwd.hpp> #include <boost/fusion/container/deque/deque_fwd.hpp>
@ -56,8 +57,8 @@ namespace boost { namespace fusion
: base(seq) : base(seq)
{} {}
explicit deque(typename add_reference<typename add_const<Head>::type>::type head explicit deque(typename detail::call_param<Head>::type head
, typename add_reference<typename add_const<Tail>::type>::type... tail) , typename detail::call_param<Tail>::type... tail)
: base(detail::deque_keyed_values<Head, Tail...>::call(head, tail...)) : base(detail::deque_keyed_values<Head, Tail...>::call(head, tail...))
{} {}

14
include/boost/fusion/container/deque/detail/keyed_element.hpp
View File

@ -8,9 +8,7 @@
#if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330) #if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330)
#define 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/fusion/support/detail/access.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/fusion/iterator/deref.hpp> #include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/next.hpp> #include <boost/fusion/iterator/next.hpp>
@ -39,10 +37,6 @@ namespace boost { namespace fusion { namespace detail
{ {
typedef Rest base; typedef Rest base;
typedef fusion_sequence_tag tag; typedef fusion_sequence_tag tag;
typedef typename
add_reference<typename add_const<Value>::type>::type
const_value_type;
typedef typename add_reference<Value>::type value_type;
using Rest::get; using Rest::get;
template <typename It> template <typename It>
@ -63,17 +57,17 @@ namespace boost { namespace fusion { namespace detail
return *this; return *this;
} }
const_value_type get(Key) const typename cref_result<Value>::type get(Key) const
{ {
return value_; return value_;
} }
value_type get(Key) typename ref_result<Value>::type get(Key)
{ {
return value_; return value_;
} }
keyed_element(const_value_type value, Rest const& rest) keyed_element(typename call_param<Value>::type value, Rest const& rest)
: Rest(rest), value_(value) : Rest(rest), value_(value)
{} {}

12
include/boost/fusion/container/list/detail/at_impl.hpp
View File

@ -10,7 +10,7 @@
#include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/detail/access.hpp>
#include <boost/type_traits/is_const.hpp> #include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/add_const.hpp> #include <boost/type_traits/add_const.hpp>
#include <boost/mpl/eval_if.hpp> #include <boost/mpl/if.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
@ -93,15 +93,15 @@ namespace boost { namespace fusion
template <typename Sequence, typename N> template <typename Sequence, typename N>
struct apply struct apply
{ {
typedef detail::cons_deref< typedef typename detail::cons_deref<
typename detail::cons_advance<Sequence, N::value>::type> typename detail::cons_advance<Sequence, N::value>::type>::type
element; element;
typedef typename typedef typename
mpl::eval_if< mpl::if_<
is_const<Sequence> is_const<Sequence>
, detail::cref_result<element> , typename detail::cref_result<element>::type
, detail::ref_result<element> , typename detail::ref_result<element>::type
>::type >::type
type; type;

10
include/boost/fusion/container/map/detail/at_impl.hpp
View File

@ -28,7 +28,9 @@ namespace boost { namespace fusion
template <typename Sequence, typename N> template <typename Sequence, typename N>
struct apply struct apply
{ {
typedef mpl::at<typename Sequence::storage_type::types, N> element; typedef typename
mpl::at<typename Sequence::storage_type::types, N>::type
element;
typedef typename detail::ref_result<element>::type type; typedef typename detail::ref_result<element>::type type;
static type static type
@ -39,9 +41,11 @@ namespace boost { namespace fusion
}; };
template <typename Sequence, typename N> template <typename Sequence, typename N>
struct apply <Sequence const, N> struct apply<Sequence const, N>
{ {
typedef mpl::at<typename Sequence::storage_type::types, N> element; typedef typename
mpl::at<typename Sequence::storage_type::types, N>::type
element;
typedef typename detail::cref_result<element>::type type; typedef typename detail::cref_result<element>::type type;
static type static type

9
include/boost/fusion/container/map/detail/deref_data_impl.hpp
View File

@ -12,8 +12,7 @@
#include <boost/fusion/iterator/deref.hpp> #include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/detail/access.hpp>
#include <boost/type_traits/is_const.hpp> #include <boost/type_traits/is_const.hpp>
#include <boost/mpl/eval_if.hpp> #include <boost/mpl/if.hpp>
#include <boost/mpl/identity.hpp>
namespace boost { namespace fusion { namespace extension namespace boost { namespace fusion { namespace extension
{ {
@ -29,10 +28,10 @@ namespace boost { namespace fusion { namespace extension
typedef typename result_of::value_of<It>::type::second_type data; typedef typename result_of::value_of<It>::type::second_type data;
typedef typename typedef typename
mpl::eval_if< mpl::if_<
is_const<typename It::seq_type> is_const<typename It::seq_type>
, detail::cref_result<mpl::identity<data> > , typename detail::cref_result<data>::type
, detail::ref_result<mpl::identity<data> > , typename detail::ref_result<data>::type
>::type >::type
type; type;

4
include/boost/fusion/container/vector/detail/at_impl.hpp
View File

@ -27,7 +27,7 @@ namespace boost { namespace fusion
template <typename Sequence, typename N> template <typename Sequence, typename N>
struct apply struct apply
{ {
typedef mpl::at<typename Sequence::types, N> element; typedef typename mpl::at<typename Sequence::types, N>::type element;
typedef typename detail::ref_result<element>::type type; typedef typename detail::ref_result<element>::type type;
static type static type
@ -40,7 +40,7 @@ namespace boost { namespace fusion
template <typename Sequence, typename N> template <typename Sequence, typename N>
struct apply <Sequence const, N> struct apply <Sequence const, N>
{ {
typedef mpl::at<typename Sequence::types, N> element; typedef typename mpl::at<typename Sequence::types, N>::type element;
typedef typename detail::cref_result<element>::type type; typedef typename detail::cref_result<element>::type type;
static type static type

9
include/boost/fusion/container/vector/detail/deref_impl.hpp
View File

@ -10,6 +10,7 @@
#include <boost/mpl/at.hpp> #include <boost/mpl/at.hpp>
#include <boost/fusion/support/detail/access.hpp> #include <boost/fusion/support/detail/access.hpp>
#include <boost/type_traits/is_const.hpp> #include <boost/type_traits/is_const.hpp>
#include <boost/mpl/if.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
@ -29,14 +30,14 @@ namespace boost { namespace fusion
typedef typename Iterator::vector vector; typedef typename Iterator::vector vector;
typedef typename Iterator::index index; typedef typename Iterator::index index;
typedef typename mpl::at< typedef typename mpl::at<
typename vector::types, index> typename vector::types, index>::type
element; element;
typedef typename typedef typename
mpl::eval_if< mpl::if_<
is_const<vector> is_const<vector>
, fusion::detail::cref_result<element> , typename fusion::detail::cref_result<element>::type
, fusion::detail::ref_result<element> , typename fusion::detail::ref_result<element>::type
>::type >::type
type; type;

12
include/boost/fusion/support/detail/access.hpp
View File

@ -1,7 +1,7 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2001-2011 Joel de Guzman Copyright (c) 2001-2011 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
#if !defined(FUSION_ACCESS_04182005_0737) #if !defined(FUSION_ACCESS_04182005_0737)
@ -15,16 +15,16 @@ namespace boost { namespace fusion { namespace detail
template <typename T> template <typename T>
struct ref_result struct ref_result
{ {
typedef typename add_reference<typename T::type>::type type; typedef typename add_reference<T>::type type;
}; };
template <typename T> template <typename T>
struct cref_result struct cref_result
{ {
typedef typename typedef typename
add_reference< add_reference<
typename add_const<typename T::type>::type typename add_const<T>::type
>::type >::type
type; type;
}; };
@ -35,7 +35,7 @@ namespace boost { namespace fusion { namespace detail
}; };
template <typename T> template <typename T>
struct call_param<T &> struct call_param<T&>
{ {
typedef T& type; typedef T& type;
}; };