macro names changed to be more self-documenting

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit b8d3c84d3c89 · 2002-09-05T23:31:30.000Z
[SVN r15172]
diff --git a/include/boost/python/detail/defaults_gen.hpp b/include/boost/python/detail/defaults_gen.hpp
@@ -224,8 +224,8 @@ struct func_stubs_base {};
 //
 //      There are two versions:
 //
-//          1. BOOST_PYTHON_FUNCTION_GENERATOR for free functions
-//          2. BOOST_PYTHON_MEM_FUN_GENERATOR for member functions.
+//          1. BOOST_PYTHON_FUNCTION_OVERLOADS for free functions
+//          2. BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS for member functions.
 //
 //      For instance, given a function:
 //
@@ -237,7 +237,7 @@ struct func_stubs_base {};
 //
 //      The macro invocation:
 //
-//          BOOST_PYTHON_FUNCTION_GENERATOR(foo_stubs, foo, 1, 4)
+//          BOOST_PYTHON_FUNCTION_OVERLOADS(foo_stubs, foo, 1, 4)
 //
 //      Generates this code:
 //
@@ -284,7 +284,7 @@ struct func_stubs_base {};
 //      for the return type (void) and the lack of the return keyword.
 //
 ///////////////////////////////////////////////////////////////////////////////
-#define BOOST_PYTHON_FUNCTION_GENERATOR(GENERATOR_NAME, FNAME, MIN_ARGS, MAX_ARGS)\
+#define BOOST_PYTHON_FUNCTION_OVERLOADS(GENERATOR_NAME, FNAME, MIN_ARGS, MAX_ARGS)\
     BPL_IMPL_GEN_FUNCTION_STUB                                                  \
     (                                                                           \
         FNAME,                                                                  \
@@ -293,7 +293,7 @@ struct func_stubs_base {};
         BOOST_PP_SUB(MAX_ARGS, MIN_ARGS)                                        \
     )                                                                           \
 
-#define BOOST_PYTHON_MEM_FUN_GENERATOR(GENERATOR_NAME, FNAME, MIN_ARGS, MAX_ARGS)\
+#define BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(GENERATOR_NAME, FNAME, MIN_ARGS, MAX_ARGS)\
     BPL_IMPL_GEN_MEM_FUNCTION_STUB                                              \
     (                                                                           \
         FNAME,                                                                  \
@@ -302,6 +302,10 @@ struct func_stubs_base {};
         BOOST_PP_SUB(MAX_ARGS, MIN_ARGS)                                        \
     )                                                                           \
 
+// deprecated macro names (to be removed)
+#define BOOST_PYTHON_FUNCTION_GENERATOR BOOST_PYTHON_FUNCTION_OVERLOADS
+#define BOOST_PYTHON_MEM_FUN_GENERATOR BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
+
 ///////////////////////////////////////////////////////////////////////////////
 #endif // DEFAULTS_GEN_JDG20020807_HPP
 
diff --git a/test/defaults.cpp b/test/defaults.cpp
@@ -49,7 +49,7 @@ bar(int a)
     return format % make_tuple(a, 'D', "default", 0.0);
 }
 
-BOOST_PYTHON_FUNCTION_GENERATOR(bar_stubs, bar, 1, 4)
+BOOST_PYTHON_FUNCTION_OVERLOADS(bar_stubs, bar, 1, 4)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -62,7 +62,7 @@ foo(int a, char b = 'D', std::string c = "default", double d = 0.0)
     return format % make_tuple(a, b, c, d);
 }
 
-BOOST_PYTHON_FUNCTION_GENERATOR(foo_stubs, foo, 1, 4)
+BOOST_PYTHON_FUNCTION_OVERLOADS(foo_stubs, foo, 1, 4)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -117,10 +117,10 @@ struct X {
     object state;
 };
 
-BOOST_PYTHON_MEM_FUN_GENERATOR(X_bar_stubs, bar, 1, 4)
-BOOST_PYTHON_MEM_FUN_GENERATOR(X_bar2_stubs, bar2, 0, 4) // tests zero arg member function
-BOOST_PYTHON_MEM_FUN_GENERATOR(X_foo_2_stubs, foo, 1, 2)
-BOOST_PYTHON_MEM_FUN_GENERATOR(X_foo_3_stubs, foo, 2, 3)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_bar_stubs, bar, 1, 4)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_bar2_stubs, bar2, 0, 4) // tests zero arg member function
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_foo_2_stubs, foo, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_foo_3_stubs, foo, 2, 3)
 
 ///////////////////////////////////////////////////////////////////////////////
 
