Skip to content

Commit 90fcd93

Browse files
author
Aleksey Gurtovoy
committed
MPL names/directory structure refactoring
[SVN r17651]
1 parent 923feda commit 90fcd93

21 files changed

+93
-93
lines changed

‎include/boost/python/args.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# include <boost/preprocessor/iteration/local.hpp>
2222

2323
# include <boost/python/detail/mpl_lambda.hpp>
24-
# include <boost/mpl/bool_c.hpp>
24+
# include <boost/mpl/bool.hpp>
2525

2626
# include <boost/type.hpp>
2727
# include <cstddef>
@@ -65,7 +65,7 @@ namespace detail
6565
BOOST_STATIC_CONSTANT(bool, is_key = is_keywords<key_t>::value);
6666
BOOST_STATIC_CONSTANT(bool, value = (is_ref & is_key));
6767

68-
typedef mpl::bool_c<value> type;
68+
typedef mpl::bool_<value> type;
6969
BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
7070
};
7171
# else
@@ -89,7 +89,7 @@ namespace detail
8989
sizeof(detail::is_keywords_test( (void (*)(T))0 ))
9090
== sizeof(detail::yes_keywords_t)));
9191

92-
typedef mpl::bool_c<value> type;
92+
typedef mpl::bool_<value> type;
9393
BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
9494
};
9595
# endif

‎include/boost/python/bases.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# include <boost/type_traits/object_traits.hpp>
99
# include <boost/python/detail/type_list.hpp>
1010
# include <boost/mpl/if.hpp>
11-
# include <boost/mpl/bool_c.hpp>
11+
# include <boost/mpl/bool.hpp>
1212
# include <boost/preprocessor/enum_params_with_a_default.hpp>
1313
# include <boost/preprocessor/enum_params.hpp>
1414

@@ -25,13 +25,13 @@ namespace boost { namespace python {
2525
{
2626
# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
2727
template <class T> struct specifies_bases
28-
: mpl::false_c
28+
: mpl::false_
2929
{
3030
};
3131

3232
template < BOOST_PP_ENUM_PARAMS_Z(1, BOOST_PYTHON_MAX_BASES, class Base) >
3333
struct specifies_bases< bases< BOOST_PYTHON_BASE_PARAMS > >
34-
: mpl::true_c
34+
: mpl::true_
3535
{
3636
};
3737
# else
@@ -48,7 +48,7 @@ namespace boost { namespace python {
4848
BOOST_STATIC_CONSTANT(bool, non_ref = !is_reference<T>::value);
4949
public:
5050
BOOST_STATIC_CONSTANT(bool, value = non_ref & (sizeof(is_bases_helper(make())) == 1));
51-
typedef mpl::bool_c<value> type;
51+
typedef mpl::bool_<value> type;
5252
};
5353
# endif
5454
template <class T, class Prev = bases<> >

‎include/boost/python/class.hpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
# include <boost/mpl/size.hpp>
2727
# include <boost/mpl/for_each.hpp>
28-
# include <boost/mpl/bool_c.hpp>
29-
# include <boost/mpl/logical/not.hpp>
30-
# include <boost/mpl/logical/or.hpp>
28+
# include <boost/mpl/bool.hpp>
29+
# include <boost/mpl/not.hpp>
30+
# include <boost/mpl/or.hpp>
3131

3232
# include <boost/python/object/select_holder.hpp>
3333
# include <boost/python/object/class_wrapper.hpp>
@@ -79,20 +79,20 @@ namespace detail
7979
struct operator_;
8080

8181
// Register to_python converters for a class T. The first argument
82-
// will be mpl::true_c unless noncopyable was specified as a
82+
// will be mpl::true_ unless noncopyable was specified as a
8383
// class_<...> template parameter. The 2nd argument is a pointer to
8484
// the type of holder that must be created. The 3rd argument is a
8585
// reference to the Python type object to be created.
8686
template <class T, class SelectHolder>
87-
inline void register_class_to_python(mpl::true_c copyable, SelectHolder selector, T* = 0)
87+
inline void register_class_to_python(mpl::true_ copyable, SelectHolder selector, T* = 0)
8888
{
8989
typedef typename SelectHolder::type holder;
9090
force_instantiate(objects::class_cref_wrapper<T, objects::make_instance<T,holder> >());
9191
SelectHolder::register_();
9292
}
9393

9494
template <class T, class SelectHolder>
95-
inline void register_class_to_python(mpl::false_c copyable, SelectHolder selector, T* = 0)
95+
inline void register_class_to_python(mpl::false_ copyable, SelectHolder selector, T* = 0)
9696
{
9797
SelectHolder::register_();
9898
}
@@ -131,7 +131,7 @@ namespace detail
131131
static void
132132
must_be_derived_class_member(Default const&)
133133
{
134-
typedef typename assertion<mpl::logical_not<is_same<Default,Fn> > >::failed test0;
134+
typedef typename assertion<mpl::not_<is_same<Default,Fn> > >::failed test0;
135135
typedef typename assertion<is_polymorphic<T> >::failed test1;
136136
typedef typename assertion<is_member_function_pointer<Fn> >::failed test2;
137137
not_a_derived_class_member<Default>(Fn());
@@ -398,7 +398,7 @@ class class_ : public objects::class_base
398398
, helper.policies(), helper.keywords())
399399
, helper.doc());
400400

401-
this->def_default(name, fn, helper, mpl::bool_c<Helper::has_default_implementation>());
401+
this->def_default(name, fn, helper, mpl::bool_<Helper::has_default_implementation>());
402402
}
403403

404404
//
@@ -411,7 +411,7 @@ class class_ : public objects::class_base
411411
char const* name
412412
, Fn fn
413413
, Helper const& helper
414-
, mpl::bool_c<true>)
414+
, mpl::bool_<true>)
415415
{
416416
detail::error::virtual_function_default<T,Fn>::must_be_derived_class_member(
417417
helper.default_implementation());
@@ -424,7 +424,7 @@ class class_ : public objects::class_base
424424
}
425425

426426
template <class Fn, class Helper>
427-
inline void def_default(char const*, Fn, Helper const&, mpl::bool_c<false>)
427+
inline void def_default(char const*, Fn, Helper const&, mpl::bool_<false>)
428428
{ }
429429

430430
//
@@ -474,7 +474,7 @@ inline void class_<T,X1,X2,X3>::register_() const
474474
objects::register_class_from_python<T,bases>();
475475

476476
detail::register_class_to_python<T>(
477-
mpl::bool_c<is_copyable>()
477+
mpl::bool_<is_copyable>()
478478
# if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
479479
, holder_selector::execute((held_type*)0)
480480
# elif BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
@@ -519,7 +519,7 @@ namespace detail
519519
{
520520
template <class T1, class T2, class T3>
521521
struct has_noncopyable
522-
: mpl::logical_or<
522+
: mpl::or_<
523523
is_same<T1,noncopyable>
524524
, is_same<T2,noncopyable>
525525
, is_same<T3,noncopyable>
@@ -530,7 +530,7 @@ namespace detail
530530
template <class T, class Prev>
531531
struct select_held_type
532532
: mpl::if_<
533-
mpl::logical_or<
533+
mpl::or_<
534534
specifies_bases<T>
535535
, is_same<T,noncopyable>
536536
>

‎include/boost/python/converter/arg_to_python.hpp‎

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

3333

34-
# include <boost/mpl/logical/or.hpp>
34+
# include <boost/mpl/or.hpp>
3535

3636
namespace boost { namespace python { namespace converter {
3737

@@ -116,7 +116,7 @@ namespace detail
116116
, shared_ptr_arg_to_python<T>
117117

118118
, typename mpl::if_<
119-
mpl::logical_or<
119+
mpl::or_<
120120
is_function<T>
121121
, python::detail::is_pointer_to_function<T>
122122
, is_member_function_pointer<T>

‎include/boost/python/converter/object_manager.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# include <boost/type_traits/object_traits.hpp>
1313
# include <boost/mpl/if.hpp>
1414
# include <boost/python/detail/indirect_traits.hpp>
15-
# include <boost/mpl/bool_c.hpp>
15+
# include <boost/mpl/bool.hpp>
1616

1717
// Facilities for dealing with types which always manage Python
1818
// objects. Some examples are object, list, str, et. al. Different
@@ -118,14 +118,14 @@ struct object_manager_traits
118118

119119
template <class T>
120120
struct is_object_manager
121-
: mpl::bool_c<object_manager_traits<T>::is_specialized>
121+
: mpl::bool_<object_manager_traits<T>::is_specialized>
122122
{
123123
};
124124

125125
# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
126126
template <class T>
127127
struct is_reference_to_object_manager
128-
: mpl::false_c
128+
: mpl::false_
129129
{
130130
};
131131

@@ -197,7 +197,7 @@ namespace detail
197197

198198
template <class T>
199199
struct is_reference_to_object_manager_nonref
200-
: mpl::false_c
200+
: mpl::false_
201201
{
202202
};
203203

@@ -211,7 +211,7 @@ namespace detail
211211
== sizeof(detail::yes_reference_to_object_manager)
212212
)
213213
);
214-
typedef mpl::bool_c<value> type;
214+
typedef mpl::bool_<value> type;
215215
};
216216
}
217217

‎include/boost/python/converter/return_from_python.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# include <boost/python/detail/void_return.hpp>
1515
# include <boost/python/errors.hpp>
1616
# include <boost/type_traits/has_trivial_copy.hpp>
17-
# include <boost/mpl/logical/and.hpp>
18-
# include <boost/mpl/bool_c.hpp>
17+
# include <boost/mpl/and.hpp>
18+
# include <boost/mpl/bool.hpp>
1919

2020
namespace boost { namespace python { namespace converter {
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# define COPY_CTOR_MUTATES_RHS_DWA2003219_HPP
88

99
#include <boost/python/detail/is_auto_ptr.hpp>
10-
#include <boost/mpl/bool_c.hpp>
10+
#include <boost/mpl/bool.hpp>
1111

1212
namespace boost { namespace python { namespace detail {
1313

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# include <boost/type_traits/ice.hpp>
1111
# include <boost/type_traits/same_traits.hpp>
1212
# include <boost/python/detail/indirect_traits.hpp>
13-
# include <boost/mpl/logical/not.hpp>
14-
# include <boost/mpl/logical/and.hpp>
15-
# include <boost/mpl/logical/or.hpp>
13+
# include <boost/mpl/not.hpp>
14+
# include <boost/mpl/and.hpp>
15+
# include <boost/mpl/or.hpp>
1616
# include <boost/type_traits/add_reference.hpp>
1717
# include <boost/mpl/lambda.hpp>
1818
# include <boost/mpl/apply.hpp>
@@ -98,8 +98,8 @@ namespace detail
9898
struct doc_extract
9999
: tuple_extract<
100100
Tuple
101-
, mpl::logical_not<
102-
mpl::logical_or<
101+
, mpl::not_<
102+
mpl::or_<
103103
is_reference_to_class<mpl::_1>
104104
, is_reference_to_member_function_pointer<mpl::_1 >
105105
>
@@ -118,10 +118,10 @@ namespace detail
118118
struct policy_extract
119119
: tuple_extract<
120120
Tuple
121-
, mpl::logical_and<
122-
mpl::logical_not<is_same<not_specified const&,mpl::_1> >
121+
, mpl::and_<
122+
mpl::not_<is_same<not_specified const&,mpl::_1> >
123123
, is_reference_to_class<mpl::_1 >
124-
, mpl::logical_not<is_reference_to_keywords<mpl::_1 > >
124+
, mpl::not_<is_reference_to_keywords<mpl::_1 > >
125125
>
126126
>
127127
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ namespace detail
102102
// template <typename OverloadsT, typename NameSpaceT>
103103
// inline void
104104
// define_stub_function(
105-
// char const* name, OverloadsT s, NameSpaceT& name_space, mpl::int_c<N>)
105+
// char const* name, OverloadsT s, NameSpaceT& name_space, mpl::int_<N>)
106106
// {
107107
// name_space.def(name, &OverloadsT::func_N);
108108
// }

0 commit comments

Comments
 (0)