From e8d2bbd2c9337cd72b49314fd8e6d9c7cbbbf97d Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 18 Sep 2002 13:24:15 +0000
Subject: [PATCH] VC6 fixes

[SVN r15438]
---
 include/boost/python/bases.hpp                       |  2 +-
 .../boost/python/detail/type_list_impl_no_pts.hpp    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/python/bases.hpp b/include/boost/python/bases.hpp
index 503301c3..6271e0fc 100644
--- a/include/boost/python/bases.hpp
+++ b/include/boost/python/bases.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace python {
         BOOST_STATIC_CONSTANT(bool, value = true);
     };
 # else
-    template < BOOST_PYTHON_BASE_PARAMS >
+    template < BOOST_PP_ENUM_PARAMS(BOOST_PYTHON_MAX_BASES, class B) >
     static char is_bases_helper(bases< BOOST_PYTHON_BASE_PARAMS > const&);
     
     static char (& is_bases_helper(...) )[256];
diff --git a/include/boost/python/detail/type_list_impl_no_pts.hpp b/include/boost/python/detail/type_list_impl_no_pts.hpp
index 70a27d35..be537793 100644
--- a/include/boost/python/detail/type_list_impl_no_pts.hpp
+++ b/include/boost/python/detail/type_list_impl_no_pts.hpp
@@ -53,11 +53,6 @@ struct type_list_count_args
     };
 };
 
-#  undef BOOST_PYTHON_IS_LIST_ARG
-#  undef BOOST_PYTHON_PLUS
-#  undef BOOST_PYTHON_LIST_FORMAL_PARAMS
-#  undef BOOST_PYTHON_LIST_ACTUAL_PARAMS
-
 template<
     BOOST_PYTHON_LIST_FORMAL_PARAMS
     >
@@ -79,6 +74,11 @@ struct type_list
         >::type type;
 };
 
+#  undef BOOST_PYTHON_IS_LIST_ARG
+#  undef BOOST_PYTHON_PLUS
+#  undef BOOST_PYTHON_LIST_FORMAL_PARAMS
+#  undef BOOST_PYTHON_LIST_ACTUAL_PARAMS
+
 }}} // namespace boost::python::detail
 
 # endif // TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
@@ -96,7 +96,7 @@ struct type_list_impl_chooser<N>
     struct result_
     {
         typedef BOOST_PP_CAT(mpl::list,N)<
-            BOOST_PYTHON_LIST_ACTUAL_PARAMS
+            BOOST_PP_ENUM_PARAMS(N, T)
             > type;
     };
 };