Skip to content

Commit bfd7f71

Browse files
author
Aleksey Gurtovoy
committed
merge new MPL version from 'mplbook' branch
[SVN r24874]
1 parent 87718f9 commit bfd7f71

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎include/boost/python/data_members.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# include <boost/type_traits/remove_cv.hpp>
2929
# endif
3030

31-
# include <boost/mpl/apply_if.hpp>
31+
# include <boost/mpl/eval_if.hpp>
3232
# include <boost/mpl/if.hpp>
3333
# include <boost/mpl/vector/vector10.hpp>
3434

‎include/boost/python/detail/caller.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# include <boost/type_traits/is_convertible.hpp>
3333

3434
# include <boost/mpl/apply.hpp>
35-
# include <boost/mpl/apply_if.hpp>
35+
# include <boost/mpl/eval_if.hpp>
3636
# include <boost/mpl/identity.hpp>
3737
# include <boost/mpl/size.hpp>
3838
# include <boost/mpl/at.hpp>
@@ -62,7 +62,7 @@ typedef int void_result_to_python;
6262
// converting the result to python.
6363
template <class Policies, class Result>
6464
struct select_result_converter
65-
: mpl::apply_if<
65+
: mpl::eval_if<
6666
is_same<Result,void>
6767
, mpl::identity<void_result_to_python>
6868
, mpl::apply1<typename Policies::result_converter,Result>

‎include/boost/python/detail/defaults_gen.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <boost/config.hpp>
2626
#include <boost/mpl/begin_end.hpp>
2727
#include <boost/mpl/next.hpp>
28-
#include <boost/mpl/apply.hpp>
28+
#include <boost/mpl/deref.hpp>
2929
#include <cstddef>
3030

3131
namespace boost { namespace python {
@@ -119,7 +119,7 @@ namespace detail
119119
#define BOOST_PYTHON_TYPEDEF_GEN(z, index, data) \
120120
typedef typename ::boost::mpl::next<BOOST_PP_CAT(iter, index)>::type \
121121
BOOST_PP_CAT(iter, BOOST_PP_INC(index)); \
122-
typedef typename ::boost::mpl::apply0<BOOST_PP_CAT(iter, index)>::type \
122+
typedef typename ::boost::mpl::deref<BOOST_PP_CAT(iter, index)>::type \
123123
BOOST_PP_CAT(T, index);
124124

125125
#define BOOST_PYTHON_FUNC_WRAPPER_GEN(z, index, data) \
@@ -145,7 +145,7 @@ namespace detail
145145
struct gen \
146146
{ \
147147
typedef typename ::boost::mpl::begin<SigT>::type rt_iter; \
148-
typedef typename ::boost::mpl::apply0<rt_iter>::type RT; \
148+
typedef typename ::boost::mpl::deref<rt_iter>::type RT; \
149149
typedef typename ::boost::mpl::next<rt_iter>::type iter0; \
150150
\
151151
BOOST_PP_REPEAT_2ND( \
@@ -184,10 +184,10 @@ namespace detail
184184
struct gen \
185185
{ \
186186
typedef typename ::boost::mpl::begin<SigT>::type rt_iter; \
187-
typedef typename ::boost::mpl::apply0<rt_iter>::type RT; \
187+
typedef typename ::boost::mpl::deref<rt_iter>::type RT; \
188188
\
189189
typedef typename ::boost::mpl::next<rt_iter>::type class_iter; \
190-
typedef typename ::boost::mpl::apply0<class_iter>::type ClassT; \
190+
typedef typename ::boost::mpl::deref<class_iter>::type ClassT; \
191191
typedef typename ::boost::mpl::next<class_iter>::type iter0; \
192192
\
193193
BOOST_PP_REPEAT_2ND( \

‎include/boost/python/detail/unwrap_wrapper.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# include <boost/python/detail/prefix.hpp>
88
# include <boost/python/detail/is_wrapper.hpp>
99
# if defined(BOOST_PYTHON_NO_SFINAE)
10-
# include <boost/mpl/apply_if.hpp>
10+
# include <boost/mpl/eval_if.hpp>
1111
# include <boost/mpl/identity.hpp>
1212
# else
1313
# include <boost/python/detail/enable_if.hpp>
@@ -23,7 +23,7 @@ struct unwrap_wrapper_helper
2323
};
2424

2525
template <class T>
26-
typename mpl::apply_if<is_wrapper<T>,unwrap_wrapper_helper<T>,mpl::identity<T> >::type*
26+
typename mpl::eval_if<is_wrapper<T>,unwrap_wrapper_helper<T>,mpl::identity<T> >::type*
2727
unwrap_wrapper(T*)
2828
{
2929
return 0;

‎include/boost/python/init.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <boost/python/def_visitor.hpp>
1818

1919
#include <boost/mpl/if.hpp>
20-
#include <boost/mpl/apply_if.hpp>
20+
#include <boost/mpl/eval_if.hpp>
2121
#include <boost/mpl/size.hpp>
2222
#include <boost/mpl/iterator_range.hpp>
2323
#include <boost/mpl/empty.hpp>
@@ -269,20 +269,20 @@ class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
269269
typedef detail::type_list<BOOST_PYTHON_OVERLOAD_ARGS> signature_;
270270

271271
typedef detail::is_optional<
272-
typename mpl::apply_if<
272+
typename mpl::eval_if<
273273
mpl::empty<signature_>
274274
, mpl::false_
275275
, mpl::back<signature_>
276276
>::type
277277
> back_is_optional;
278278

279-
typedef typename mpl::apply_if<
279+
typedef typename mpl::eval_if<
280280
back_is_optional
281281
, mpl::back<signature_>
282282
, mpl::vector0<>
283283
>::type optional_args;
284284

285-
typedef typename mpl::apply_if<
285+
typedef typename mpl::eval_if<
286286
back_is_optional
287287
, mpl::if_<
288288
mpl::empty<optional_args>

‎include/boost/python/object/class_metadata.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# include <boost/type_traits/is_polymorphic.hpp>
2424

2525
# include <boost/mpl/if.hpp>
26-
# include <boost/mpl/apply_if.hpp>
26+
# include <boost/mpl/eval_if.hpp>
2727
# include <boost/mpl/bool.hpp>
2828
# include <boost/mpl/or.hpp>
2929
# include <boost/mpl/identity.hpp>
@@ -162,7 +162,7 @@ struct class_metadata
162162

163163
// Compute the "wrapped type", that is, if held_type is a smart
164164
// pointer, we're talking about the pointee.
165-
typedef typename mpl::apply_if<
165+
typedef typename mpl::eval_if<
166166
use_value_holder
167167
, mpl::identity<held_type>
168168
, pointee<held_type>
@@ -176,7 +176,7 @@ struct class_metadata
176176
> use_back_reference;
177177

178178
// Select the holder.
179-
typedef typename mpl::apply_if<
179+
typedef typename mpl::eval_if<
180180
use_back_reference
181181
, mpl::if_<
182182
use_value_holder

‎include/boost/python/object/make_holder.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# include <boost/mpl/next.hpp>
1919
# include <boost/mpl/begin_end.hpp>
20-
# include <boost/mpl/apply.hpp>
20+
# include <boost/mpl/deref.hpp>
2121

2222
# include <boost/preprocessor/iterate.hpp>
2323
# include <boost/preprocessor/iteration/local.hpp>
@@ -64,7 +64,7 @@ struct make_holder<N>
6464
typedef typename mpl::begin<ArgList>::type iter0;
6565

6666
# define BOOST_PP_LOCAL_MACRO(n) \
67-
typedef typename mpl::apply0<iter##n>::type t##n; \
67+
typedef typename mpl::deref<iter##n>::type t##n; \
6868
typedef typename forward<t##n>::type f##n; \
6969
typedef typename mpl::next<iter##n>::type \
7070
BOOST_PP_CAT(iter,BOOST_PP_INC(n)); // Next iterator type

‎include/boost/python/operators.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# include <boost/python/detail/not_specified.hpp>
1414
# include <boost/python/back_reference.hpp>
1515
# include <boost/mpl/if.hpp>
16-
# include <boost/mpl/apply_if.hpp>
16+
# include <boost/mpl/eval_if.hpp>
1717
# include <boost/python/self.hpp>
1818
# include <boost/python/other.hpp>
1919
# include <boost/lexical_cast.hpp>
@@ -128,7 +128,7 @@ namespace detail
128128
template <class ClassT>
129129
void visit(ClassT& cl) const
130130
{
131-
typedef typename mpl::apply_if<
131+
typedef typename mpl::eval_if<
132132
is_same<L,self_t>
133133
, mpl::if_<
134134
is_same<R,self_t>

0 commit comments

Comments
 (0)