Subject: [Boost-commit] svn:boost r77125 - in branches/release: boost/python boost/python/detail libs/python libs/python/doc/v2
From: rwgk_at_[hidden]
Date: 2012-02-26 21:49:42
Author: rwgk
Date: 2012-02-26 21:49:42 EST (Sun, 26 Feb 2012)
New Revision: 77125
URL: http://svn.boost.org/trac/boost/changeset/77125
Log:
merging current boost/python and libs/python from trunk into release branch
Properties modified:
branches/release/boost/python/ (props changed)
branches/release/libs/python/ (props changed)
Text files modified:
branches/release/boost/python/detail/config.hpp | 4 +-
branches/release/boost/python/module_init.hpp | 2
branches/release/libs/python/doc/v2/make_function.html | 51 ++++++++++++++++++---------------------
3 files changed, 27 insertions(+), 30 deletions(-)
Modified: branches/release/boost/python/detail/config.hpp
==============================================================================
--- branches/release/boost/python/detail/config.hpp (original)
+++ branches/release/boost/python/detail/config.hpp 2012-02-26 21:49:42 EST (Sun, 26 Feb 2012)
@@ -76,13 +76,13 @@
# if BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
# if defined(BOOST_PYTHON_SOURCE)
-# define BOOST_PYTHON_DECL __attribute__ ((visibility("default")))
+# define BOOST_PYTHON_DECL __attribute__ ((__visibility__("default")))
# define BOOST_PYTHON_BUILD_DLL
# else
# define BOOST_PYTHON_DECL
# endif
# define BOOST_PYTHON_DECL_FORWARD
-# define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((visibility("default")))
+# define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default")))
# elif (defined(_WIN32) || defined(__CYGWIN__))
# if defined(BOOST_PYTHON_SOURCE)
# define BOOST_PYTHON_DECL __declspec(dllexport)
Modified: branches/release/boost/python/module_init.hpp
==============================================================================
--- branches/release/boost/python/module_init.hpp (original)
+++ branches/release/boost/python/module_init.hpp 2012-02-26 21:49:42 EST (Sun, 26 Feb 2012)
@@ -76,7 +76,7 @@
# define BOOST_PYTHON_MODULE_INIT(name) \
void BOOST_PP_CAT(init_module_,name)(); \
-extern "C" __attribute__ ((visibility("default"))) _BOOST_PYTHON_MODULE_INIT(name)
+extern "C" __attribute__ ((__visibility__("default"))) _BOOST_PYTHON_MODULE_INIT(name)
# else
Modified: branches/release/libs/python/doc/v2/make_function.html
==============================================================================
--- branches/release/libs/python/doc/v2/make_function.html (original)
+++ branches/release/libs/python/doc/v2/make_function.html 2012-02-26 21:49:42 EST (Sun, 26 Feb 2012)
@@ -96,10 +96,10 @@
to <code>f</code>. <ul>
<li> If <code>policies</code> are supplied, it
will be applied to the function as described <a href=
- "CallPolicies.html">here</a>.
+ "CallPolicies.html">here</a>.
<li>If <code>keywords</code> are
supplied, the keywords will be applied in order to the final
- arguments of the resulting function.
+ arguments of the resulting function.
<li>If <code>Signature</code>
is supplied, it should be an instance of an <a
href="../../../mpl/doc/refmanual/front-extensible-sequence.html">MPL front-extensible
@@ -125,36 +125,33 @@
</dl>
<pre>
-<a name=
-"make_constructor-spec"></a>template <class T, class ArgList, class Generator>
-object make_constructor();
-
-template <class ArgList, class Generator, class Policies>
+<a name="make_constructor-spec">template <class F></a>
+object make_constructor(F f)
+
+template <class F, class Policies>
+<a href=
+"object.html#object-spec">object</a> make_constructor(F f, Policies const& policies)
+
+template <class F, class Policies, class KeywordsOrSignature>
+<a href=
+"object.html#object-spec">object</a> make_constructor(F f, Policies const& policies, KeywordsOrSignature const& ks)
+
+template <class F, class Policies, class Keywords, class Signature>
<a href=
-"object.html#object-spec">object</a> make_constructor(Policies const& policies)
+"object.html#object-spec">object</a> make_constructor(F f, Policies const& policies, Keywords const& kw, Signature const& sig)
</pre>
<dl class="function-semantics">
- <dt><b>Requires:</b> <code>T</code> is a class type.
- <code>Policies</code> is a model of <a href=
- "CallPolicies.html">CallPolicies</a>. <code>ArgList</code> is an <a
- href="../../../mpl/doc/refmanual/forward-sequence.html">MPL sequence</a> of C++ argument
- types (<i>A1, A2,... AN</i>) such that if
- <code>a1, a2</code>... <code>aN</code> are objects of type
- <i>A1, A2,... AN</i> respectively, the expression <code>new
- Generator::apply<T>::type(a1, a2</code>... <code>aN</code>)
- is valid. Generator is a model of <a href=
- "HolderGenerator.html">HolderGenerator</a>.</dt>
+ <dt><b>Requires:</b> <code>F</code> is a
+ function pointer type. If <code>policies</code> are supplied, it must
+ be a model of CallPolicies. If
+ <code>kewords</code> are supplied, it must be the result of a <a href=
+ "args.html#keyword-expression"><em>keyword-expression</em></a>
+ specifying no more arguments than the <a href=
+ "definitions.html#arity">arity</a> of <code>f</code>.</dt>
<dt><b>Effects:</b> Creates a Python callable object which, when called
- from Python, expects its first argument to be a Boost.Python extension
- class object. It converts its remaining its arguments to C++ and passes
- them to the constructor of a dynamically-allocated
- <code>Generator::apply<T>::type</code> object, which is then
- installed in the extension class object. In the second form, the
- <code>policies</code> are applied to the arguments and result (<a href=
- "http://www.python.org/doc/current/lib/bltin-null-object.html">None</a>)
- of the Python callable object</dt>
+ from Python, converts its arguments to C++ and calls <code>f</code>.</dt>
<dt><b>Returns:</b> An instance of <a href=
"object.html#object-spec">object</a> which holds the new Python
@@ -186,7 +183,7 @@
def("choose_function", choose_function);
}
</pre>
- It can be used this way in Python:
+ It can be used this way in Python:
<pre>
>>> from make_function_test import *
>>> f = choose_function(1)