From 5dab2802b3a241136ce6db34a8bb89954c643e19 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 10 Apr 2002 19:33:52 +0000
Subject: [PATCH] changed the formula for function description with the PP lib

[SVN r13437]
---
 include/boost/python/detail/arg_tuple_size.hpp | 8 ++++----
 include/boost/python/detail/caller.hpp         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/python/detail/arg_tuple_size.hpp b/include/boost/python/detail/arg_tuple_size.hpp
index 69558337..e958c1c0 100644
--- a/include/boost/python/detail/arg_tuple_size.hpp
+++ b/include/boost/python/detail/arg_tuple_size.hpp
@@ -34,7 +34,7 @@ template <class F> struct arg_tuple_size;
 // Specializations for function pointers
 #  define BOOST_PYTHON_ARG_TUPLE_SIZE_PF(args, ignored)                                         \
 template <class R BOOST_PP_COMMA_IF(args) BOOST_MPL_TEMPLATE_PARAMETERS(0, args, class A)>      \
-struct arg_tuple_size<BOOST_PYTHON_PF(args)>                                                  \
+struct arg_tuple_size<BOOST_PYTHON_FN(*,0,args)>                                                \
 {                                                                                               \
     BOOST_STATIC_CONSTANT(std::size_t, value = args);                                           \
 };
@@ -42,7 +42,7 @@ struct arg_tuple_size<BOOST_PYTHON_PF(args)>
 // Specializations for member function pointers
 #  define BOOST_PYTHON_ARG_TUPLE_SIZE_PMF(args, cv)                     \
 template <class R, BOOST_MPL_TEMPLATE_PARAMETERS(0, args, class A)>     \
-struct arg_tuple_size<BOOST_PYTHON_PMF(args,cv)>                      \
+struct arg_tuple_size<BOOST_PYTHON_FN(A0::*,1,args) cv()>                      \
 {                                                                       \
     BOOST_STATIC_CONSTANT(std::size_t, value = args);                   \
 };
@@ -62,11 +62,11 @@ struct arg_tuple_size<BOOST_PYTHON_PMF(args,cv)>                      \
 
 #  define BOOST_PYTHON_ARG_TUPLE_SIZE_PF(args, ignored)                                         \
 template <class R BOOST_PP_COMMA_IF(args) BOOST_MPL_TEMPLATE_PARAMETERS(0, args, class A)>      \
-char_array<args> arg_tuple_size_helper(BOOST_PYTHON_PF(args));
+char_array<args> arg_tuple_size_helper(BOOST_PYTHON_FN(*,0,args));
 
 #  define BOOST_PYTHON_ARG_TUPLE_SIZE_PMF(args, cv)                 \
 template <class R, BOOST_MPL_TEMPLATE_PARAMETERS(0, args, class A)> \
-char_array<args> arg_tuple_size_helper(BOOST_PYTHON_PMF(args,cv));
+char_array<args> arg_tuple_size_helper(BOOST_PYTHON_FN(A0::*,1,args)cv());
     
 # endif
 
diff --git a/include/boost/python/detail/caller.hpp b/include/boost/python/detail/caller.hpp
index feaa9397..4a779e19 100644
--- a/include/boost/python/detail/caller.hpp
+++ b/include/boost/python/detail/caller.hpp
@@ -37,7 +37,7 @@ template <
     BOOST_PP_COMMA_IF(args_) BOOST_MPL_TEMPLATE_PARAMETERS(0, args_, class A)   \
   >                                                                             \
 PyObject* operator()(                                                           \
-    BOOST_PYTHON_NAMED_PF(f,args_)                                              \
+    BOOST_PYTHON_FN(*f,0,args_)                                                 \
   , PyObject* args, PyObject* keywords                                          \
   , P const& policies                                                           \
   ) const                                                                       \
@@ -51,7 +51,7 @@ BOOST_PYTHON_REPEAT_ARITY_2ND(BOOST_PYTHON_CALLER_PF, nil)
 # define BOOST_PYTHON_CALLER_PMF(args_, cv)                                     \
 template <class P, class R, BOOST_MPL_TEMPLATE_PARAMETERS(0, args_, class A)>   \
 PyObject* operator()(                                                           \
-    BOOST_PYTHON_NAMED_PMF(f,args_,cv)                                          \
+    BOOST_PYTHON_FN(A0::*f,1,args_)cv()                                         \
   , PyObject* args, PyObject* keywords                                          \
   , P const& policies                                                           \
   ) const                                                                       \