This commit was manufactured by cvs2svn to create tag

'Version_1_33_1_beta'. [SVN r31604]
merged from trunk
2026-01-20 04:42:28 +00:00 · 2005-11-08 23:18:41 +00:00 · 2005-11-04 21:39:06 +00:00 · 2005-11-01 15:09:28 +00:00 · 2005-10-31 19:25:36 +00:00 · 2005-10-27 12:22:23 +00:00
18 changed files with 946 additions and 760 deletions
--- a/doc/building.html
+++ b/doc/building.html
@@ -82,9 +82,12 @@
    boost installation (if you have already built boost from the top level
    this may have no effect, since the work is already done).</p>

-    <h3><a name="configuration">Basic Configuration</a></h3>
-    You may need to configure the following variables to point Boost.Build at
-    your Python installation: 
+    <h3><a name="configuration">Basic Configuration</a></h3> You may
+    need to configure the following variables to point Boost.Build at
+    your Python installation.  Variables can be either set in the
+    environment or passed on the <code>bjam</code> command-line
+    as <code>-s</code><i>name</i><code>=</code><i>value</i>.  Variable
+    names are case-sensitive.

    <table border="1" summary="build configuration variables">
      <tr>
@@ -98,28 +101,29 @@
      </tr>

      <tr>
-        <td><code>PYTHON_ROOT</code></td>
-
-        <td>The root directory of your Python installation</td>
-
-        <td>Windows:&nbsp;<code>c:/tools/python</code>
-        Unix:&nbsp;<code>/usr/local</code></td>
-
-        <td>On Unix, this is the <code>--with-prefix=</code> directory used
-        to configure Python</td>
-      </tr>
-
      <tr>
        <td><code>PYTHON_VERSION</code></td>

        <td>The The 2-part python Major.Minor version number</td>

-        <td><code>2.2</code></td>
+        <td><code>2.4</code></td>

        <td>Be sure not to include a third number, e.g. <b>not</b>
        "<code>2.2.1</code>", even if that's the version you have.</td>
      </tr>

+        <td><code>PYTHON_ROOT</code></td>
+
+        <td>The root directory of your Python installation</td>
+
+        <td>Windows:&nbsp;<code>c:/Python</code><i>(10*Version)</i>, e.g. <code>c:/Python24</code>
+<br>
+        *nix/Cygwin:&nbsp;<code>/usr</code></td>
+
+        <td>On *nix, this should be the <code>--prefix=</code> directory used
+        to configure Python when it was built and installed.</td>
+      </tr>
+
      <tr>
        <td><code>PYTHON_INCLUDES</code></td>

@@ -172,7 +176,7 @@
      <tr>
        <td><code>CYGWIN_PYTHON_[DEBUG_]ROOT</code></td>

-        <td>unix-style path containing the <code>include/</code> directory
+        <td>*nix-style path containing the <code>include/</code> directory
        containing
        <code>python$(CYGWIN_PYTHON_[DEBUG_]VERSION)/python.h</code>.</td>

@@ -219,8 +223,10 @@
    <h3><a name="mingw">Notes for MinGW (and Cygwin with -mno-cygwin) GCC
    Users</a></h3>

-    <p>You will need to create a MinGW-compatible version of the Python
-    library; the one shipped with Python will only work with a
+    <p>If you are using a version of Python prior to 2.4.1 with a
+    MinGW prior to 3.0.0 (with binutils-2.13.90-20030111-1), you will
+    need to create a MinGW-compatible version of the Python library;
+    the one shipped with Python will only work with a
    Microsoft-compatible linker. Follow the instructions in the
    "Non-Microsoft" section of the "Building Extensions: Tips And Tricks"
    chapter in <a href=
@@ -359,7 +365,7 @@ path-global BOOST_ROOT : ../../.. ;
    <p>The first two variants of the <code>boost_python</code> library are
    built by default, and are compatible with the default Python
    distribution. The <code>debug-python</code> variant corresponds to a
-    specially-built debugging version of Python. On Unix platforms, this
+    specially-built debugging version of Python. On *nix platforms, this
    python is built by adding <code>--with-pydebug</code> when configuring
    the Python build. On Windows, the debugging version of Python is
    generated by the "Win32 Debug" target of the <code>PCBuild.dsw</code>
--- a/doc/news.html
+++ b/doc/news.html
@@ -1,105 +1,171 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
+<head>
+  <meta name="generator" content=
+  "HTML Tidy for Cygwin (vers 1st September 2004), see www.w3.org">
+  <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+  <link rel="stylesheet" type="text/css" href="boost.css">

-    <title>Boost.Python - News/Change Log</title>
-  </head>
+  <title>Boost.Python - News/Change Log</title>
+</head>

-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../boost.png" border="0"></a></h3>
-        </td>
+<body link="#0000FF" vlink="#800080">
+  <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
+  "header">
+    <tr>
+      <td valign="top" width="300">
+        <h3><a href="../../../index.htm"><img height="86" width="277" alt=
+        "C++ Boost" src="../../../boost.png" border="0"></a></h3>
+      </td>

-        <td valign="top">
-          <h1 align="center"><a href="index.html">Boost.Python</a></h1>
+      <td valign="top">
+        <h1 align="center"><a href="index.html">Boost.Python</a></h1>

-          <h2 align="center">News/Change Log</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
+        <h2 align="center">News/Change Log</h2>
+      </td>
+    </tr>
+  </table>
+  <hr>

-    <dl class="page-index">
-      <dt>11 March 2005</dt>
+  <dl class="page-index">
+    <dt>19 October 2005 - 1.33.1 release</dt>

-      <dd>
-        <ul>
-          <li>Added a hack that will fool PyDoc into working with Boost.Python, thanks to Nick Rasmussen</li>
-        </ul>
-      </dd>
-      <dt>19 November 2004 - 1.32 release</dt>
+    <dd>
+      <ul>
+        <li><code>wrapper&lt;T&gt;</code> can now be used as expected with a
+        held type of <i>some-smart-pointer</i><code>&lt;T&gt;</code></li>

-      <dd>
-        <ul>
-                               <li>Updated to use the Boost Software License.</li>
-                               <li>A new, <a href="tutorial/doc/html/python/exposing.html#python.class_virtual_functions">better method of wrapping classes with virtual functions</a> has been implemented.</li>
-                               <li>Support for upcoming GCC symbol export control features have been folded in, thanks to Niall Douglas.</li>
-                               <li>Improved support for <code>std::auto_ptr</code>-like types.</li>
-                               <li>The Visual C++ bug that makes top-level <i>cv-qualification</i> of function parameter types part of the function type has been worked around.</li>
-                               <li>Components used by other libraries have been moved out of <code>python/detail</code> and into <code> boost/detail</code> to improve dependency relationships.</li>        
-                               <li>Miscellaneous bug fixes and compiler workarounds.</li>
-        </ul>
-      </dd>
-      <dt>8 Sept 2004</dt>
+        <li>The build now assumes Python 2.4 by default, rather than 2.2</li>

-      <dd>
-        Support for Python's Bool type, thanks to <a
-        mailto="dholth-at-fastmail.fm">Daniel Holth</a>.
-      </dd>
+        <li>Support Python that's built without Unicode support</li>

-      <dt>11 Sept 2003</dt>
+        <li>Support for wrapping classes with overloaded address-of
+        (<code>&amp;</code>) operators</li>
+      </ul>
+    </dd>

-      <dd>
-        <ul>
-          <li>Changed the response to multiple to-python converters being
-          registered for the same type from a hard error into warning;
-          Boost.Python now reports the offending type in the message.</li>
+    <dt>14 August 2005 - 1.33 release</dt>

-          <li>Added builtin <code>std::wstring</code> conversions</li>
+    <dd>
+      <ul>
+        <li>Support for docstrings on nonstatic properties.</li>

-          <li>Added <code>std::out_of_range</code> =&gt; Python
-          <code>IndexError</code> exception conversion, thanks to <a href=
-          "mailto:RaoulGough-at-yahoo.co.uk">Raoul Gough</a></li>
-        </ul>
-      </dd>
+        <li>We now export the client-provided docstrings for
+        <code>init&lt;optional&lt;&gt; &gt;</code> and
+        <i>XXX</i><code>_FUNCTION_OVERLOADS()</code> for only the last
+        overload.</li>

-      <dt>9 Sept 2003</dt>
+        <li>Fixed some support for Embedded VC++ 4</li>

-      <dd>Added new <code><a href="v2/str.html#str-spec">str</a></code></dd>
+        <li>Better support for rvalue from-python conversions of shared_ptr:
+        always return a pointer that holds the owning python object *unless*
+        the python object contains a NULL shared_ptr holder of the right
+        type.</li>

-      <dt>constructors which take a range of characters, allowing strings
-      containing nul (<code>'\0'</code>) characters.</dt>
+        <li>Support for exposing <code>vector&lt;T*&gt;</code> with the
+        indexing suite.</li>

-      <dt>8 Sept 2003</dt>
+        <li>Support for GCC-3.3 on MacOS.</li>

-      <dd>Added the ability to create methods from function objects (with an
-      <code>operator()</code>); see the <a href=
-      "v2/make_function.html#make_function-spec">make_function</a> docs for
-      more info.</dd>
+        <li>updated visual studio project build file to include two new files
+        (slice.cpp and wrapper.cpp)</li>

-      <dt>10 August 2003</dt>
+        <li>Added search feature to the index page.</li>

-      <dd>Added the new <code>properties</code> unit tests contributed by <a
-      href="mailto:romany-at-actimize.com">Roman Yakovenko</a> and documented
-      <code>add_static_property</code> at his urging.</dd>
+        <li>Numerous fixes to the tutorial</li>

-      <dt>1 August 2003</dt>
+        <li>Numerous workarounds for MSVC 6 and 7, GCC 2.96, and EDG
+        2.45</li>
+      </ul>
+    </dd>

-      <dd>
-        Added the new <code>arg</code> class contributed by <a href=
-        "mailto:nickm-at-sitius.com">Nikolay Mladenov</a> which supplies the
-        ability to wrap functions that can be called with ommitted arguments
-        in the middle: 
-<pre>
+    <dt>11 March 2005</dt>
+
+    <dd>
+      <ul>
+        <li>Added a hack that will fool PyDoc into working with Boost.Python,
+        thanks to Nick Rasmussen</li>
+      </ul>
+    </dd>
+
+    <dt>19 November 2004 - 1.32 release</dt>
+
+    <dd>
+      <ul>
+        <li>Updated to use the Boost Software License.</li>
+
+        <li>A new, <a href=
+        "tutorial/doc/html/python/exposing.html#python.class_virtual_functions">
+        better method of wrapping classes with virtual functions</a> has been
+        implemented.</li>
+
+        <li>Support for upcoming GCC symbol export control features have been
+        folded in, thanks to Niall Douglas.</li>
+
+        <li>Improved support for <code>std::auto_ptr</code>-like types.</li>
+
+        <li>The Visual C++ bug that makes top-level <i>cv-qualification</i>
+        of function parameter types part of the function type has been worked
+        around.</li>
+
+        <li>Components used by other libraries have been moved out of
+        <code>python/detail</code> and into <code>boost/detail</code> to
+        improve dependency relationships.</li>
+
+        <li>Miscellaneous bug fixes and compiler workarounds.</li>
+      </ul>
+    </dd>
+
+    <dt>8 Sept 2004</dt>
+
+    <dd>Support for Python's Bool type, thanks to <a href=
+    "mailto:dholth-at-fastmail.fm">Daniel Holth</a>.</dd>
+
+    <dt>11 Sept 2003</dt>
+
+    <dd>
+      <ul>
+        <li>Changed the response to multiple to-python converters being
+        registered for the same type from a hard error into warning;
+        Boost.Python now reports the offending type in the message.</li>
+
+        <li>Added builtin <code>std::wstring</code> conversions</li>
+
+        <li>Added <code>std::out_of_range</code> =&gt; Python
+        <code>IndexError</code> exception conversion, thanks to <a href=
+        "mailto:RaoulGough-at-yahoo.co.uk">Raoul Gough</a></li>
+      </ul>
+    </dd>
+
+    <dt>9 Sept 2003</dt>
+
+    <dd>Added new <code><a href="v2/str.html#str-spec">str</a></code></dd>
+
+    <dt>constructors which take a range of characters, allowing strings
+    containing nul (<code>'\0'</code>) characters.</dt>
+
+    <dt>8 Sept 2003</dt>
+
+    <dd>Added the ability to create methods from function objects (with an
+    <code>operator()</code>); see the <a href=
+    "v2/make_function.html#make_function-spec">make_function</a> docs for
+    more info.</dd>
+
+    <dt>10 August 2003</dt>
+
+    <dd>Added the new <code>properties</code> unit tests contributed by
+    <a href="mailto:romany-at-actimize.com">Roman Yakovenko</a> and
+    documented <code>add_static_property</code> at his urging.</dd>
+
+    <dt>1 August 2003</dt>
+
+    <dd>
+      Added the new <code>arg</code> class contributed by <a href=
+      "mailto:nickm-at-sitius.com">Nikolay Mladenov</a> which supplies the
+      ability to wrap functions that can be called with ommitted arguments in
+      the middle:
+      <pre>
 void f(int x = 0, double y = 3.14, std::string z = std::string("foo"));

 BOOST_PYTHON_MODULE(test)
@@ -108,111 +174,104 @@ BOOST_PYTHON_MODULE(test)
       , (arg("x", 0), arg("y", 3.14), arg("z", "foo")));
 }
 
-</pre>
-        And in Python: 
-<pre>
+</pre>And in Python:
+      <pre>
 &gt;&gt;&gt; import test
 &gt;&gt;&gt; f(0, z = "bar")
 &gt;&gt;&gt; f(z = "bar", y = 0.0)
-</pre>
-        Thanks, Nikolay!
-      </dd>
+</pre>Thanks, Nikolay!
+    </dd>

-      <dt>22 July 2003</dt>
+    <dt>22 July 2003</dt>

-      <dd>Killed the dreaded "bad argument type for builtin operation" error.
-      Argument errors now show the actual and expected argument types!</dd>
+    <dd>Killed the dreaded "bad argument type for builtin operation" error.
+    Argument errors now show the actual and expected argument types!</dd>

-      <dt>19 July 2003</dt>
+    <dt>19 July 2003</dt>

-      <dd>Added the new <code><a href=
-      "v2/return_arg.html">return_arg</a></code> policy from <a href=
-      "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks,
-      Nikolay!</dd>
+    <dd>Added the new <code><a href=
+    "v2/return_arg.html">return_arg</a></code> policy from <a href=
+    "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks, Nikolay!</dd>

-      <dt>18 March, 2003</dt>
+    <dt>18 March, 2003</dt>

-      <dd><a href="mailto:Gottfried.Ganssauge-at-haufe.de">Gottfried
-      Gan&szlig;auge</a> has contributed <a href=
-      "v2/opaque_pointer_converter.html">opaque pointer support</a>.<br>
-       <a href="mailto:nicodemus-at-globalite.com.br">Bruno da Silva de Oliveira</a>
-      has contributed the exciting <a href="../pyste/index.html">Pyste</a>
-      ("Pie-steh") package.</dd>
+    <dd><a href="mailto:Gottfried.Ganssauge-at-haufe.de">Gottfried
+    Gan&szlig;auge</a> has contributed <a href=
+    "v2/opaque_pointer_converter.html">opaque pointer support</a>.<br>
+    <a href="mailto:nicodemus-at-globalite.com.br">Bruno da Silva de
+    Oliveira</a> has contributed the exciting <a href=
+    "../pyste/index.html">Pyste</a> ("Pie-steh") package.</dd>

-      <dt>24 February 2003</dt>
+    <dt>24 February 2003</dt>

-      <dd>Finished improved support for <code>boost::shared_ptr</code>. Now
-      any wrapped object of C++ class <code>X</code> can be converted
-      automatically to <code>shared_ptr&lt;X&gt;</code>, regardless of how it
-      was wrapped. The <code>shared_ptr</code> will manage the lifetime of
-      the Python object which supplied the <code>X</code>, rather than just
-      the <code>X</code> object itself, and when such a
-      <code>shared_ptr</code> is converted back to Python, the original
-      Python object will be returned.</dd>
+    <dd>Finished improved support for <code>boost::shared_ptr</code>. Now any
+    wrapped object of C++ class <code>X</code> can be converted automatically
+    to <code>shared_ptr&lt;X&gt;</code>, regardless of how it was wrapped.
+    The <code>shared_ptr</code> will manage the lifetime of the Python object
+    which supplied the <code>X</code>, rather than just the <code>X</code>
+    object itself, and when such a <code>shared_ptr</code> is converted back
+    to Python, the original Python object will be returned.</dd>

-      <dt>19 January 2003</dt>
+    <dt>19 January 2003</dt>

-      <dd>Integrated <code>staticmethod</code> support from <a href=
-      "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks,
-      Nikolay!</dd>
+    <dd>Integrated <code>staticmethod</code> support from <a href=
+    "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks, Nikolay!</dd>

-      <dt>29 December 2002</dt>
+    <dt>29 December 2002</dt>

-      <dd>Added Visual Studio project file and instructions from Brett
-      Calcott. Thanks, Brett!</dd>
+    <dd>Added Visual Studio project file and instructions from Brett Calcott.
+    Thanks, Brett!</dd>

-      <dt>20 December 2002</dt>
+    <dt>20 December 2002</dt>

-      <dd>Added automatic downcasting for pointers, references, and smart
-      pointers to polymorphic class types upon conversion to python</dd>
+    <dd>Added automatic downcasting for pointers, references, and smart
+    pointers to polymorphic class types upon conversion to python</dd>

-      <dt>18 December 2002</dt>
+    <dt>18 December 2002</dt>

-      <dd>Optimized from_python conversions for wrapped classes by putting
-      the conversion logic in the shared library instead of registering
-      separate converters for each class in each extension module</dd>
+    <dd>Optimized from_python conversions for wrapped classes by putting the
+    conversion logic in the shared library instead of registering separate
+    converters for each class in each extension module</dd>

-      <dt>19 November 2002</dt>
+    <dt>19 November 2002</dt>

-      <dd>Removed the need for users to cast base class member function
-      pointers when used as arguments to <a href=
-      "v2/class.html#class_-spec-modifiers">add_property</a></dd>
+    <dd>Removed the need for users to cast base class member function
+    pointers when used as arguments to <a href=
+    "v2/class.html#class_-spec-modifiers">add_property</a></dd>

-      <dt>13 December 2002</dt>
+    <dt>13 December 2002</dt>

-      <dd>Allow exporting of <a href=
-      "v2/enum.html#enum_-spec"><code>enum_</code></a> values into enclosing
-      <a href="v2/scope.html#scope-spec"><code>scope</code></a>.<br>
-       Fixed unsigned integer conversions to deal correctly with numbers that
-      are out-of-range of <code>signed long</code>.</dd>
+    <dd>Allow exporting of <a href=
+    "v2/enum.html#enum_-spec"><code>enum_</code></a> values into enclosing
+    <a href="v2/scope.html#scope-spec"><code>scope</code></a>.<br>
+    Fixed unsigned integer conversions to deal correctly with numbers that
+    are out-of-range of <code>signed long</code>.</dd>

-      <dt>14 November 2002</dt>
+    <dt>14 November 2002</dt>

-      <dd>Auto-detection of class data members wrapped with <a href=
-      "v2/data_members.html#make_getter-spec"><code>make_getter</code></a></dd>
+    <dd>Auto-detection of class data members wrapped with <a href=
+    "v2/data_members.html#make_getter-spec"><code>make_getter</code></a></dd>

-      <dt>13 November 2002</dt>
+    <dt>13 November 2002</dt>

-      <dd>Full Support for <code>std::auto_ptr&lt;&gt;</code> added.</dd>
+    <dd>Full Support for <code>std::auto_ptr&lt;&gt;</code> added.</dd>

-      <dt>October 2002</dt>
+    <dt>October 2002</dt>

-      <dd>Ongoing updates and improvements to tutorial documentation</dd>
+    <dd>Ongoing updates and improvements to tutorial documentation</dd>

-      <dt>10 October 2002</dt>
+    <dt>10 October 2002</dt>

-      <dd>Boost.Python V2 is released!</dd>
-    </dl>
-    <hr>
+    <dd>Boost.Python V2 is released!</dd>
+  </dl>
+  <hr>

-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     19 November 2004 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
+  <p>Revised 
+  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
+   19 November 2004 
+  <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>

-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002-2003.</i></p>
-  </body>
+  <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
+  Abrahams</a> 2002-2003.</i></p>
+</body>
 </html>
-
--- a/doc/v2/class.html
+++ b/doc/v2/class.html
--- a/include/boost/python/detail/is_xxx.hpp
+++ b/include/boost/python/detail/is_xxx.hpp
@@ -1,62 +1,13 @@
-// Copyright David Abrahams 2003.
+// Copyright David Abrahams 2005.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 #ifndef IS_XXX_DWA2003224_HPP
 # define IS_XXX_DWA2003224_HPP

-# include <boost/config.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/preprocessor/enum_params.hpp>
+# include <boost/detail/is_xxx.hpp>

-# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/add_reference.hpp>
-
-#  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs)          \
-template <class X_>                                                     \
-struct is_##name                                                        \
-{                                                                       \
-    typedef char yes;                                                   \
-    typedef char (&no)[2];                                              \
-                                                                        \
-    static typename add_reference<X_>::type dummy;                      \
-                                                                        \
-    struct helpers                                                      \
-    {                                                                   \
-        template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class U) >          \
-        static yes test(                                                \
-           qualified_name< BOOST_PP_ENUM_PARAMS_Z(1, nargs, U) >&, int  \
-        );                                                              \
-                                                                        \
-        template <class U>                                              \
-        static no test(U&, ...);                                        \
-    };                                                                  \
-                                                                        \
-    BOOST_STATIC_CONSTANT(                                              \
-        bool, value                                                     \
-        = !is_reference<X_>::value                                      \
-        & (sizeof(helpers::test(dummy, 0)) == sizeof(yes)));            \
-                                                                        \
-    typedef mpl::bool_<value> type;                                     \
-};
-
-# else
-
-#  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs)  \
-template <class T>                                              \
-struct is_##name : mpl::false_                                  \
-{                                                               \
-};                                                              \
-                                                                \
-template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class T) >          \
-struct is_##name<                                               \
-   qualified_name< BOOST_PP_ENUM_PARAMS_Z(1, nargs, T) >        \
->                                                               \
-   : mpl::true_                                                 \
-{                                                               \
-};
-
-# endif
+#  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs) \
+    BOOST_DETAIL_IS_XXX_DEF(name, qualified_name, nargs)

 #endif // IS_XXX_DWA2003224_HPP
--- a/include/boost/python/detail/wrap_python.hpp
+++ b/include/boost/python/detail/wrap_python.hpp
@@ -22,6 +22,26 @@

 #ifdef _DEBUG
 # ifndef BOOST_DEBUG_PYTHON
+#  ifdef _MSC_VER  
+    // VC8.0 will complain if system headers are #included both with
+    // and without _DEBUG defined, so we have to #include all the
+    // system headers used by pyconfig.h right here.
+#   include <stddef.h>
+#   include <stdarg.h>
+#   include <stdio.h>
+#   include <stdlib.h>
+#   include <assert.h>
+#   include <errno.h>
+#   include <ctype.h>
+#   include <wchar.h>
+#   include <basetsd.h>
+#   include <io.h>
+#   include <limits.h>
+#   include <float.h>
+#   include <string.h>
+#   include <math.h>
+#   include <time.h>
+#  endif
 #  undef _DEBUG // Don't let Python force the debug library just because we're debugging.
 #  define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
 # endif
@@ -97,7 +117,7 @@ typedef int pid_t;

 #   define HAVE_LONG_LONG 1
 #   define LONG_LONG long long
-#  endif 
+#  endif

 # elif defined(__MWERKS__)

@@ -143,6 +163,10 @@ typedef int pid_t;
 #ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
 # undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
 # define _DEBUG
+# ifdef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
+#  undef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H
+#  undef _CRT_NOFORCE_MANIFEST
+# endif
 #endif

 #if !defined(PY_MAJOR_VERSION) || PY_MAJOR_VERSION < 2
--- a/include/boost/python/object/class_metadata.hpp
+++ b/include/boost/python/object/class_metadata.hpp
@@ -30,6 +30,10 @@
 # include <boost/mpl/for_each.hpp>
 # include <boost/mpl/placeholders.hpp>
 # include <boost/mpl/single_view.hpp>
+
+# include <boost/mpl/assert.hpp>
+# include <boost/type_traits/is_same.hpp>
+
 # include <boost/type_traits/is_convertible.hpp>

 # include <boost/noncopyable.hpp>
@@ -49,6 +53,12 @@ struct register_base_of
    template <class Base>
    inline void operator()(Base*) const
    {
+# if !BOOST_WORKAROUND(BOOST_MSVC, == 1200)
+        BOOST_MPL_ASSERT_NOT((is_same<Base,Derived>));
+# else
+        BOOST_STATIC_ASSERT(!(is_same<Base,Derived>::value));
+# endif 
+        
        // Register the Base class
        register_dynamic_id<Base>();

@@ -58,7 +68,7 @@ struct register_base_of
        // Register the down-cast, if appropriate.
        this->register_downcast((Base*)0, is_polymorphic<Base>());
    }
-    
+
 private:
    static inline void register_downcast(void*, mpl::false_) {}
    
@@ -186,7 +196,7 @@ struct class_metadata
      , mpl::if_<
            use_value_holder
          , value_holder<T>
-          , pointer_holder<held_type,T>
+          , pointer_holder<held_type,wrapped>
        >
    >::type holder;
    
@@ -199,7 +209,8 @@ struct class_metadata
    template <class T2>
    inline static void register_aux(python::wrapper<T2>*) 
    {
-        class_metadata::register_aux2((T2*)0, mpl::true_());
+        typedef typename mpl::not_<is_same<T2,wrapped> >::type use_callback;
+        class_metadata::register_aux2((T2*)0, use_callback());
    }

    inline static void register_aux(void*) 
@@ -242,6 +253,7 @@ struct class_metadata
    //
    inline static void maybe_register_class_to_python(void*, mpl::true_) {}
    
+
    template <class T2>
    inline static void maybe_register_class_to_python(T2*, mpl::false_)
    {
--- a/include/boost/python/object/value_holder.hpp
+++ b/include/boost/python/object/value_holder.hpp
@@ -29,6 +29,8 @@
 #  include <boost/preprocessor/repetition/enum_params.hpp>
 #  include <boost/preprocessor/repetition/enum_binary_params.hpp>

+#  include <boost/utility/addressof.hpp>
+
 namespace boost { namespace python { namespace objects { 

 #  if BOOST_WORKAROUND(__GNUC__, == 2)
@@ -86,12 +88,12 @@ private: // required holder implementation
 template <class Value>
 void* value_holder<Value>::holds(type_info dst_t, bool null_ptr_only)
 {
-    if (void* wrapped = holds_wrapped(dst_t, &m_held, &m_held))
+    if (void* wrapped = holds_wrapped(dst_t, boost::addressof(m_held), boost::addressof(m_held)))
        return wrapped;
    
    type_info src_t = python::type_id<Value>();
-    return src_t == dst_t ? &m_held
-        : find_static_type(&m_held, src_t, dst_t);
+    return src_t == dst_t ? boost::addressof(m_held)
+        : find_static_type(boost::addressof(m_held), src_t, dst_t);
 }

 template <class Value, class Held>
@@ -132,7 +134,7 @@ void* value_holder_back_reference<Value,Held>::holds(
            BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil)
            )
    {
-        python::detail::initialize_wrapper(self, &this->m_held);
+        python::detail::initialize_wrapper(self, boost::addressof(this->m_held));
    }

 # undef N
--- a/include/boost/python/override.hpp
+++ b/include/boost/python/override.hpp
@@ -55,12 +55,15 @@ namespace detail
      }
 #  endif 
      
-#  if !defined(BOOST_MSVC) || BOOST_WORKAROUND(_MSC_FULL_VER, > 140040607)
+#  if defined(BOOST_MSVC) && BOOST_WORKAROUND(_MSC_FULL_VER, <= 140040607) || BOOST_WORKAROUND(BOOST_INTEL_WIN, >= 900)
+      // No operator T&
+#  else
+      
      template <class T>
      operator T&() const
      {
          converter::return_from_python<T&> converter;
-          return converter(m_obj.release());
+          return converter(const_cast<handle<>&>(m_obj).release());
      }
 #  endif 

--- a/test/Jamfile
+++ b/test/Jamfile
@@ -101,6 +101,10 @@ bpl-test crossmod_exception
 [ bpl-test andreas_beyer ]
 [ bpl-test polymorphism ]
 [ bpl-test polymorphism2 ]
+  
+[ bpl-test wrapper_held_type ]
+[ bpl-test polymorphism2_auto_ptr ]
+  
 [ bpl-test auto_ptr ]
 [ bpl-test minimal ]
 [ bpl-test args ]
@@ -115,7 +119,7 @@ bpl-test crossmod_exception
 [ bpl-test keywords : keywords.cpp keywords_test.py ]

 [ extension builtin_converters : test_builtin_converters.cpp <template>../build/extension ]
-[ boost-python-runtest builtin_converters : test_builtin_converters.py <pyd>builtin_converters ]
+[ boost-python-runtest builtin_converters : test_builtin_converters.py <pyd>builtin_converters : : : -v ]

 [ bpl-test test_pointer_adoption ]
 [ bpl-test operators ]
@@ -164,11 +168,11 @@ bpl-test crossmod_exception
 [ bpl-test vector_indexing_suite ]
 [ bpl-test pointer_vector ]

-
 [ extension map_indexing_suite_ext
    : map_indexing_suite.cpp int_map_indexing_suite.cpp <template>../build/extension ]
-[ boost-python-runtest 
-    map_indexing_suite : map_indexing_suite.py <pyd>map_indexing_suite_ext ]
+      
+#[ boost-python-runtest 
+#    map_indexing_suite : map_indexing_suite.py <pyd>map_indexing_suite_ext : : : -v ]

 # if $(TEST_BIENSTMAN_NON_BUGS)
 # {
--- a/test/polymorphism.cpp
+++ b/test/polymorphism.cpp
@@ -1,4 +1,3 @@
-#define BOOST_NO_STD_WSTRING
 // Copyright David Abrahams 2002.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
--- a/test/polymorphism2.cpp
+++ b/test/polymorphism2.cpp
@@ -13,6 +13,14 @@
 #include <boost/python/call.hpp>
 #include <boost/utility.hpp>

+#include <memory>
+
+#ifdef HELD_BY_AUTO_PTR
+# define HELD_PTR(X) , std::auto_ptr< X >
+#else
+# define HELD_PTR(X)
+#endif 
+
 using namespace boost::python;

 struct P
@@ -123,19 +131,23 @@ C& getCCppObj ()

 A* pass_a(A* x) { return x; }

+#ifdef HELD_BY_AUTO_PTR
+BOOST_PYTHON_MODULE_INIT(polymorphism2_auto_ptr_ext)
+#else
 BOOST_PYTHON_MODULE_INIT(polymorphism2_ext)
+#endif 
 {
-    class_<ACallback,boost::noncopyable>("A")
+    class_<ACallback HELD_PTR(A),boost::noncopyable>("A")
        .def("f", &A::f, &ACallback::default_f)
        ;
    
    def("getBCppObj", getBCppObj, return_value_policy<reference_existing_object>());

-    class_<C,bases<A>,boost::noncopyable>("C")
+    class_<C HELD_PTR(C),bases<A>,boost::noncopyable>("C")
        .def("f", &C::f)
        ;
    
-    class_<DCallback,bases<A>,boost::noncopyable>("D")
+    class_<DCallback HELD_PTR(D),bases<A>,boost::noncopyable>("D")
        .def("f", &D::f)
        .def("g", &D::g)
        ;
@@ -152,7 +164,7 @@ BOOST_PYTHON_MODULE_INIT(polymorphism2_ext)
        .def("f", pure_virtual(&P::f))
        ;

-    class_<Q, bases<P> >("Q")
+    class_<Q HELD_PTR(Q), bases<P> >("Q")
        .def("g", &P::g) // make sure virtual inheritance doesn't interfere
        ;
 }
--- a/test/polymorphism2.py
+++ b/test/polymorphism2.py
@@ -2,7 +2,7 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 import unittest
-from polymorphism2_ext import *
+import sys

 class PolymorphTest(unittest.TestCase):

@@ -77,11 +77,18 @@ class PolymorphTest(unittest.TestCase):
      r = R()
      self.failUnlessEqual ('R.f', r.f())
      
-                        
-if __name__ == "__main__":
-   
-   # remove the option which upsets unittest
+
+def test():
+   # remove the option that upsets unittest
   import sys
   sys.argv = [ x for x in sys.argv if x != '--broken-auto-ptr' ]
-   
   unittest.main()
+
+# This nasty hack basically says that if we're loaded by another module, we'll
+# be testing polymorphism2_auto_ptr_ext instead of polymorphism2_ext.
+if __name__ == "__main__":
+   from polymorphism2_ext import *
+   test()
+else:
+   from polymorphism2_auto_ptr_ext import *
+   
--- a/test/polymorphism2_auto_ptr.cpp
+++ b/test/polymorphism2_auto_ptr.cpp
@@ -0,0 +1,6 @@
+// Copyright David Abrahams 2005. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#define HELD_BY_AUTO_PTR
+#include "polymorphism2.cpp"
--- a/test/polymorphism2_auto_ptr.py
+++ b/test/polymorphism2_auto_ptr.py
@@ -0,0 +1,5 @@
+# Copyright David Abrahams 2005. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+import polymorphism2
+polymorphism2.test()
--- a/test/test_builtin_converters.cpp
+++ b/test/test_builtin_converters.cpp
@@ -85,14 +85,14 @@ BOOST_PYTHON_MODULE(builtin_converters)
    def("rewrap_value_complex_double", by_value<std::complex<double> >::rewrap);
    def("rewrap_value_complex_long_double", by_value<std::complex<long double> >::rewrap);
    def("rewrap_value_wstring",
-# ifdef BOOST_NO_STD_WSTRING
+# if defined(BOOST_NO_STD_WSTRING) || !defined(Py_USING_UNICODE)
        identity_
 # else 
        by_value<std::wstring>::rewrap
 # endif 
    );
    def("rewrap_value_string",
-# ifdef BOOST_NO_STD_WSTRING
+# if defined(BOOST_NO_STD_WSTRING) || !defined(Py_USING_UNICODE)
        identity_
 # else 
        by_value<std::wstring>::rewrap
--- a/test/test_builtin_converters.py
+++ b/test/test_builtin_converters.py
@@ -78,12 +78,23 @@ r"""
 'hello, world'
 >>> rewrap_value_string('yo, wassup?')
 'yo, wassup?'
->>> rewrap_value_wstring(u'yo, wassup?')
-u'yo, wassup?'

-    test that overloading on unicode works:
+>>> try:
+...     if unicode: pass
+... except:
+...     print "u'yo, wassup?'"
+... else:
+...     eval("rewrap_value_wstring(u'yo, wassup?')")
+u'yo, wassup?'
    
->>> rewrap_value_string(u'yo, wassup?')
+   test that overloading on unicode works:
+
+>>> try:
+...     if unicode: pass
+... except:
+...     print "u'yo, wassup?'"
+... else:
+...     eval("rewrap_value_string(u'yo, wassup?')")
 u'yo, wassup?'

   wrap strings with embedded nulls:
--- a/test/wrapper_held_type.cpp
+++ b/test/wrapper_held_type.cpp
@@ -0,0 +1,68 @@
+// Copyright David Abrahams 2005. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/python/register_ptr_to_python.hpp>
+#include <boost/python/def.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/wrapper.hpp>
+#include <boost/python/module.hpp>
+#include <boost/python/implicit.hpp>
+
+#include <memory>
+
+struct data
+{
+    virtual int id() const
+    {
+        return 42;
+    }
+};
+    
+std::auto_ptr<data> create_data()
+{ 
+    return std::auto_ptr<data>( new data ); 
+}
+
+void do_nothing( std::auto_ptr<data>& ){}
+
+    
+namespace bp = boost::python;
+
+struct data_wrapper : data, bp::wrapper< data >
+{
+    data_wrapper(data const & arg )
+    : data( arg )
+      , bp::wrapper< data >()
+    {}
+
+    data_wrapper()
+    : data()
+      , bp::wrapper< data >()
+    {}
+
+    virtual int id() const
+    {
+        if( bp::override id = this->get_override( "id" ) )
+            return bp::call<int>(id.ptr()); // id();
+        else
+            return data::id(  );
+    }
+    
+    virtual int default_id(  ) const
+    {
+        return this->data::id( );
+    }
+
+};
+
+BOOST_PYTHON_MODULE(wrapper_held_type_ext)
+{
+    bp::class_< data_wrapper, std::auto_ptr< data > >( "data" )    
+        .def( "id", &data::id, &::data_wrapper::default_id );
+
+    bp::def( "do_nothing", &do_nothing );
+    bp::def( "create_data", &create_data );
+}    
+
+#include "module_tail.cpp"
--- a/test/wrapper_held_type.py
+++ b/test/wrapper_held_type.py
@@ -0,0 +1,34 @@
+# Copyright David Abrahams 2005. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+'''
+>>> from wrapper_held_type_ext import *
+>>> d = data()
+>>> print d.id()
+42
+>>> do_nothing( d )
+>>> print d.id()
+42
+>>> d = create_data()
+>>> print d.id()
+42
+>>> do_nothing( d )
+>>> print d.id()
+42
+'''
+
+def run(args = None):
+    import sys
+    import doctest
+
+    if args is not None:
+        sys.argv = args
+    return doctest.testmod(sys.modules.get(__name__))
+    
+if __name__ == '__main__':
+    print "running..."
+    import sys
+    status = run()[0]
+    if (status == 0): print "Done."
+    sys.exit(status)
+
Author	SHA1	Message	Date
nobody	ee43d1884c	This commit was manufactured by cvs2svn to create tag 'Version_1_33_1_beta'. [SVN r31604]	2005-11-08 23:18:41 +00:00
Dave Abrahams	9e588c4ca2	merged from trunk [SVN r31558]	2005-11-04 21:39:06 +00:00
Dave Abrahams	ccabeef937	merged from trunk [SVN r31529]	2005-11-01 15:09:28 +00:00
Dave Abrahams	fecdada51d	merged from trunk [SVN r31516]	2005-10-31 19:25:36 +00:00
Dave Abrahams	f0d1de94a0	merged from trunk [SVN r31495]	2005-10-27 12:22:23 +00:00
Dave Abrahams	c9bca62047	merged from trunk [SVN r31467]	2005-10-25 19:10:23 +00:00
Dave Abrahams	312908b72c	merged from trunk [SVN r31399]	2005-10-19 22:03:37 +00:00
Dave Abrahams	ae438aa67a	merged from trunk [SVN r31397]	2005-10-19 18:28:28 +00:00
Dave Abrahams	daf842e534	Add the ability to easily use new-style polymorphism wrappers with smart pointer held_type. [SVN r31395]	2005-10-19 18:22:53 +00:00
Dave Abrahams	8fa75c8fb5	merged from trunk [SVN r31394]	2005-10-19 18:19:23 +00:00
nobody	2e8a265abf	This commit was manufactured by cvs2svn to create branch 'RC_1_33_0'. [SVN r31393]	2005-10-19 18:17:14 +00:00
Dave Abrahams	55f6c08095	merged from trunk [SVN r31386]	2005-10-19 13:18:01 +00:00
Dave Abrahams	8aa504f190	merged from trunk [SVN r31330]	2005-10-14 19:30:27 +00:00
Dave Abrahams	2cede68e3a	merged from trunk [SVN r31326]	2005-10-14 16:44:24 +00:00
Dave Abrahams	354151926b	merged from trunk [SVN r31323]	2005-10-14 15:54:40 +00:00
Dave Abrahams	92c9053dcd	merged from trunk [SVN r31320]	2005-10-14 15:05:40 +00:00
Dave Abrahams	f20e7d5e5c	merged from trunk [SVN r31291]	2005-10-11 21:24:00 +00:00
Dave Abrahams	0af24b311e	merged from trunk [SVN r31280]	2005-10-11 13:19:43 +00:00