Skip to content

Commit e8d2bbd

Browse files
committed
VC6 fixes
[SVN r15438]
1 parent 065a53b commit e8d2bbd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

include/boost/python/bases.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace boost { namespace python {
3333
BOOST_STATIC_CONSTANT(bool, value = true);
3434
};
3535
# else
36-
template < BOOST_PYTHON_BASE_PARAMS >
36+
template < BOOST_PP_ENUM_PARAMS(BOOST_PYTHON_MAX_BASES, class B) >
3737
static char is_bases_helper(bases< BOOST_PYTHON_BASE_PARAMS > const&);
3838

3939
static char (& is_bases_helper(...) )[256];

include/boost/python/detail/type_list_impl_no_pts.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ struct type_list_count_args
5353
};
5454
};
5555

56-
# undef BOOST_PYTHON_IS_LIST_ARG
57-
# undef BOOST_PYTHON_PLUS
58-
# undef BOOST_PYTHON_LIST_FORMAL_PARAMS
59-
# undef BOOST_PYTHON_LIST_ACTUAL_PARAMS
60-
6156
template<
6257
BOOST_PYTHON_LIST_FORMAL_PARAMS
6358
>
@@ -79,6 +74,11 @@ struct type_list
7974
>::type type;
8075
};
8176

77+
# undef BOOST_PYTHON_IS_LIST_ARG
78+
# undef BOOST_PYTHON_PLUS
79+
# undef BOOST_PYTHON_LIST_FORMAL_PARAMS
80+
# undef BOOST_PYTHON_LIST_ACTUAL_PARAMS
81+
8282
}}} // namespace boost::python::detail
8383

8484
# endif // TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
@@ -96,7 +96,7 @@ struct type_list_impl_chooser<N>
9696
struct result_
9797
{
9898
typedef BOOST_PP_CAT(mpl::list,N)<
99-
BOOST_PYTHON_LIST_ACTUAL_PARAMS
99+
BOOST_PP_ENUM_PARAMS(N, T)
100100
> type;
101101
};
102102
};

0 commit comments

Comments
 (0)