Version 1.35.0 RC3

[SVN r43909]
Merge from trunk 43901 at Dave's request
2026-01-21 17:12:22 +00:00 · 2008-03-28 13:24:38 +00:00 · 2008-03-28 02:16:12 +00:00 · 2008-03-24 23:04:36 +00:00 · 2008-03-24 23:02:57 +00:00 · 2008-03-16 11:38:32 +00:00
51 changed files with 174 additions and 233 deletions
--- a/doc/building.html
+++ b/doc/building.html
@@ -158,8 +158,8 @@ all the parts of your Python installation.  If it isn't, consider
 <p>If you're still having trouble, Someone on one of the following
 mailing lists may be able to help:</p>
 <ul class="simple">
-<li>The <a class="reference external" href="http://www.boost.org/community/groups.html#jamboost">Boost.Build mailing list</a> for issues related to Boost.Build</li>
-<li>The Python <a class="reference external" href="http://www.boost.org/community/groups.html#cplussig">C++ Sig</a> for issues specifically related to Boost.Python</li>
+<li>The <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#jamboost">Boost.Build mailing list</a> for issues related to Boost.Build</li>
+<li>The Python <a class="reference external" href="http://www.boost.org/more/mailing_lists.htm#cplussig">C++ Sig</a> for issues specifically related to Boost.Python</li>
 </ul>
 </div>
 <div class="section" id="in-case-everything-seemed-to-work">
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -11,7 +11,7 @@
   :alt: Boost C++ Libraries:
   :class: boost-logo

-__ ../index.html
+__ ../index.htm


 .. section-numbering::
@@ -177,8 +177,8 @@ mailing lists may be able to help:
 * The `Boost.Build mailing list`__ for issues related to Boost.Build
 * The Python `C++ Sig`__ for issues specifically related to Boost.Python

-__ http://www.boost.org/community/groups.html#jamboost
-__ http://www.boost.org/community/groups.html#cplussig
+__ http://www.boost.org/more/mailing_lists.htm#jamboost
+__ http://www.boost.org/more/mailing_lists.htm#cplussig

 In Case Everything Seemed to Work
 ---------------------------------
--- a/doc/support.html
+++ b/doc/support.html
@@ -47,7 +47,7 @@
       &nbsp;</dt>

      <dt><b><a href=
-      "http://www.boost.org/community/groups.html#cplussig">The Python
+      "http://www.boost.org/more/mailing_lists.htm#cplussig">The Python
      C++-sig</a></b> mailing list is a forum for discussing Python/C++
      interoperability, and Boost.Python in particular. Post your
      Boost.Python questions here.<br>
--- a/doc/tutorial/doc/html/index.html
+++ b/doc/tutorial/doc/html/index.html
@@ -3,17 +3,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Chapter 1. python 1.0</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
 <link rel="start" href="index.html" title="Chapter 1. python 1.0">
-<link rel="next" href="python/hello.html" title=" Building Hello World">
+<link rel="next" href="python/hello.html" title="Building Hello World">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
-<td align="center"><a href="../../../../../../people/people.htm">People</a></td>
-<td align="center"><a href="../../../../../../more/faq.htm">FAQ</a></td>
+<td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
+<td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
 <td align="center"><a href="../../../../../../more/index.htm">More</a></td>
 </tr></table>
 <hr>
@@ -31,7 +31,7 @@
 <div><p class="copyright">Copyright © 2002-2005 Joel
      de Guzman, David Abrahams</p></div>
 <div><div class="legalnotice">
-<a name="id455917"></a><p>
+<a name="id2625929"></a><p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">
        http://www.boost.org/LICENSE_1_0.txt </a>)
@@ -93,10 +93,10 @@
      code takes on the look of a kind of declarative interface definition language
      (IDL).
    </p>
-<a name="quickstart.hello_world"></a><h2>
-<a name="id385257"></a>
+<a name="quickstart.hello_world"></a><h3>
+<a name="id2625972"></a>
      Hello World
-    </h2>
+    </h3>
 <p>
      Following C/C++ tradition, let's start with the "hello, world". A
      C++ Function:
@@ -136,8 +136,8 @@
 <p>
        </p>
 <p>
-          <span class="emphasis"><em><span class="bold"><b>Next stop... Building your Hello World
-          module from start to finish...</b></span></em></span>
+          <span class="emphasis"><em><span class="bold"><strong>Next stop... Building your Hello World
+          module from start to finish...</strong></span></em></span>
        </p>
 <p>
      </p>
@@ -145,7 +145,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 07, 2007 at 03:34:24 GMT</small></p></td>
+<td align="left"><p><small>Last revised: March 15, 2008 at 13:46:47 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/tutorial/doc/html/python/embedding.html
+++ b/doc/tutorial/doc/html/python/embedding.html
@@ -40,7 +40,7 @@
      Python/C API at all. So stay tuned... <span class="inlinemediaobject"><img src="../images/smiley.png" alt="smiley"></span>
    </p>
 <a name="embedding.building_embedded_programs"></a><h2>
-<a name="id471171"></a>
+<a name="id471329"></a>
      Building embedded programs
    </h2>
 <p>
@@ -82,7 +82,7 @@ exe embedded_program # name of the executable
    &lt;find-library&gt;$(PYTHON_EMBEDDED_LIBRARY) ;
 </pre>
 <a name="embedding.getting_started"></a><h2>
-<a name="id471276"></a>
+<a name="id471434"></a>
      Getting started
    </h2>
 <p>
@@ -139,7 +139,7 @@ exe embedded_program # name of the executable
        automate the process.
      </p>
 <a name="using_the_interpreter.running_python_code"></a><h2>
-<a name="id471439"></a>
+<a name="id471597"></a>
        Running Python code
      </h2>
 <p>
@@ -190,7 +190,7 @@ exe embedded_program # name of the executable
        a phrase that is well-known in programming circles.
      </p>
 <a name="using_the_interpreter.manipulating_python_objects"></a><h2>
-<a name="id472027"></a>
+<a name="id472185"></a>
        Manipulating Python objects
      </h2>
 <p>
@@ -217,7 +217,7 @@ exe embedded_program # name of the executable
 <span class="keyword">int</span> <span class="identifier">five_squared</span> <span class="special">=</span> <span class="identifier">extract</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">result</span><span class="special">);</span>
 </pre>
 <a name="using_the_interpreter.exception_handling"></a><h2>
-<a name="id472399"></a>
+<a name="id472557"></a>
        Exception handling
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/exposing.html
+++ b/doc/tutorial/doc/html/python/exposing.html
@@ -533,7 +533,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="python.class_operators_special_functions"></a>Class Operators/Special Functions</h3></div></div></div>
 <a name="class_operators_special_functions.python_operators"></a><h2>
-<a name="id461460"></a>
+<a name="id461481"></a>
        Python Operators
      </h2>
 <p>
@@ -582,7 +582,7 @@
        expressions".
      </p>
 <a name="class_operators_special_functions.special_methods"></a><h2>
-<a name="id462216"></a>
+<a name="id462238"></a>
        Special Methods
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/functions.html
+++ b/doc/tutorial/doc/html/python/functions.html
@@ -212,7 +212,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <li><span class="bold"><b>BOOM!</b></span></li>
 </ol></div>
 <a name="call_policies.call_policies"></a><h2>
-<a name="id464076"></a>
+<a name="id464235"></a>
        Call Policies
      </h2>
 <p>
@@ -415,7 +415,7 @@ Namespaces are one honking great idea -- let's do more of those!
        </li>
 </ul></div>
 <a name="default_arguments.boost_python_function_overloads"></a><h2>
-<a name="id466117"></a>
+<a name="id466276"></a>
        BOOST_PYTHON_FUNCTION_OVERLOADS
      </h2>
 <p>
@@ -445,7 +445,7 @@ Namespaces are one honking great idea -- let's do more of those!
 <span class="identifier">def</span><span class="special">(</span><span class="string">"foo"</span><span class="special">,</span> <span class="identifier">foo</span><span class="special">,</span> <span class="identifier">foo_overloads</span><span class="special">());</span>
 </pre>
 <a name="default_arguments.boost_python_member_function_overloads"></a><h2>
-<a name="id466436"></a>
+<a name="id466594"></a>
        BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
      </h2>
 <p>
@@ -491,7 +491,7 @@ Namespaces are one honking great idea -- let's do more of those!
        reference</a> for details.
      </p>
 <a name="default_arguments.init_and_optional"></a><h2>
-<a name="id466799"></a>
+<a name="id466958"></a>
        init and optional
      </h2>
 <p>
@@ -565,7 +565,7 @@ Namespaces are one honking great idea -- let's do more of those!
        (0) arguments and a maximum of 3 arguments.
      </p>
 <a name="auto_overloading.manual_wrapping"></a><h2>
-<a name="id467581"></a>
+<a name="id467739"></a>
        Manual Wrapping
      </h2>
 <p>
--- a/doc/tutorial/doc/html/python/hello.html
+++ b/doc/tutorial/doc/html/python/hello.html
@@ -26,7 +26,7 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="python.hello"></a> Building Hello World</h2></div></div></div>
 <a name="hello.from_start_to_finish"></a><h2>
-<a name="id387672"></a>
+<a name="id386189"></a>
      From Start To Finish
    </h2>
 <p>
@@ -92,7 +92,7 @@
      platforms. The complete list of Bjam executables can be found <a href="http://sourceforge.net/project/showfiles.php?group_id=7586" target="_top">here</a>.
    </p>
 <a name="hello.let_s_jam_"></a><h2>
-<a name="id386265"></a>
+<a name="id386347"></a>
      Let's Jam!
    </h2>
 <p>
@@ -108,7 +108,7 @@
      you going.
    </p>
 <a name="hello.running_bjam"></a><h2>
-<a name="id386322"></a>
+<a name="id386404"></a>
      Running bjam
    </h2>
 <p>
@@ -180,6 +180,16 @@ bjam
      Or something similar. If all is well, you should now have built the DLLs and
      run the Python program.
    </p>
+<div class="note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../../doc/html/images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td colspan="2" align="left" valign="top"><p>
+        Starting from Boost 1.35, bjam erases the generated executables (e.g. pyd
+        file). To keep bjam from doing that, pass --preserve-test-targets to bjam.
+      </p></td></tr>
+</table></div>
 <div class="blockquote"><blockquote class="blockquote">
 <p>
        </p>
--- a/doc/tutorial/doc/html/python/object.html
+++ b/doc/tutorial/doc/html/python/object.html
@@ -196,7 +196,7 @@
 </span><span class="identifier">d</span><span class="special">[</span><span class="char">'whatever'</span><span class="special">]</span> <span class="special">=</span> <span class="number">3</span><span class="special">;</span>           <span class="comment">// modifies the copy
 </span></pre>
 <a name="derived_object_types.class__lt_t_gt__as_objects"></a><h2>
-<a name="id469586"></a>
+<a name="id469744"></a>
        class_&lt;T&gt; as objects
      </h2>
 <p>
--- a/doc/tutorial/doc/tutorial.qbk
+++ b/doc/tutorial/doc/tutorial.qbk
@@ -93,7 +93,7 @@ who had to use a different tool.

 We will skip over the details. Our objective will be to simply create
 the hello world module and run it in Python. For a complete reference to
-building Boost.Python, check out: [@/libs/python/doc/building.html
+building Boost.Python, check out: [@../../../building.html
 building.html]. After this brief ['bjam] tutorial, we should have built
 the DLLs and run a python program using the extension.

@@ -118,7 +118,7 @@ platforms. The complete list of Bjam executables can be found
 [h2 Let's Jam!]
 __jam__

-[@/libs/python/example/tutorial/Jamroot Here] is our minimalist Jamroot
+[@../../../../example/tutorial/Jamroot Here] is our minimalist Jamroot
 file. Simply copy the file and tweak [^use-project boost] to where your
 boost root directory is and your OK.

@@ -463,7 +463,7 @@ functions so that a Python override may be called:
    };

 Notice too that in addition to inheriting from `Base`, we also multiply-
-inherited `wrapper<Base>` (See [@/libs/python/doc/v2/wrapper.html Wrapper]). The
+inherited `wrapper<Base>` (See [@../../../v2/wrapper.html Wrapper]). The
 `wrapper` template makes the job of wrapping classes that are meant to
 overridden in Python, easier.

@@ -495,7 +495,7 @@ Methods correspond roughly to C++'s [*member functions]]
 [section Virtual Functions with Default Implementations]

 We've seen in the previous section how classes with pure virtual functions are
-wrapped using Boost.Python's [@/libs/python/doc/v2/wrapper.html class wrapper]
+wrapped using Boost.Python's [@../../../v2/wrapper.html class wrapper]
 facilities. If we wish to wrap [*non]-pure-virtual functions instead, the
 mechanism is a bit different.

@@ -812,7 +812,7 @@ or more policies can be composed by chaining. Here's the general syntax:
            policy3<args...> > >

 Here is the list of predefined call policies. A complete reference detailing
-these can be found [@/libs/python/doc/v2/reference.html#models_of_call_policies here].
+these can be found [@../../../v2/reference.html#models_of_call_policies here].

 * [*with_custodian_and_ward]:  Ties lifetimes of the arguments
 * [*with_custodian_and_ward_postcall]:  Ties lifetimes of the arguments and results
@@ -970,7 +970,7 @@ fourth macro argument). The thin wrappers are all enclosed in a class named

    .def("wack_em", &george::wack_em, george_overloads());

-See the [@/libs/python/doc/v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec overloads reference]
+See the [@../../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec overloads reference]
 for details.

 [h2 init and optional]
@@ -1267,7 +1267,7 @@ associated with the C++ type passed as its first parameter.
 The scope is a class that has an associated global Python object which
 controls the Python namespace in which new extension classes and wrapped
 functions will be defined as attributes. Details can be found
-[@/libs/python/doc/v2/scope.html here].]
+[@../../../v2/scope.html here].]

 You can access those values in Python as

@@ -1328,7 +1328,7 @@ in Boost's [^/libs/python/build/bin-stage] subdirectory. On Windows, the
 variants are called [^boost_python.lib] (for release builds) and
 [^boost_python_debug.lib] (for debugging). If you can't find the libraries,
 you probably haven't built Boost.Python yet. See
-[@/libs/python/doc/building.html Building and Testing] on how to do this.
+[@../../../building.html Building and Testing] on how to do this.

 Python's library can be found in the [^/libs] subdirectory of
 your Python directory. On Windows it is called pythonXY.lib where X.Y is
@@ -1381,13 +1381,13 @@ interpreter. This may be fixed in a future version of boost.python.]
 [section Using the interpreter]

 As you probably already know, objects in Python are reference-counted.
-Naturally, the [^PyObject]s of the Python\/C API are also reference-counted.
+Naturally, the [^PyObject]s of the Python/C API are also reference-counted.
 There is a difference however. While the reference-counting is fully
-automatic in Python, the Python\/C API requires you to do it
+automatic in Python, the Python/C API requires you to do it
 [@http://www.python.org/doc/current/api/refcounts.html by hand]. This is
 messy and especially hard to get right in the presence of C++ exceptions.
-Fortunately Boost.Python provides the [@/libs/python/doc/v2/handle.html handle] and
-[@/libs/python/doc/v2/object.html object] class templates to automate the process.
+Fortunately Boost.Python provides the [@../../../v2/handle.html handle] and
+[@../../../v2/object.html object] class templates to automate the process.

 [h2 Running Python code]

@@ -1450,7 +1450,7 @@ which returns the result directly:
 [h2 Exception handling]

 If an exception occurs in the evaluation of the python expression,
-[@/libs/python/doc/v2/errors.html#error_already_set-spec error_already_set] is thrown:
+[@../../../v2/errors.html#error_already_set-spec error_already_set] is thrown:

    try
    {
@@ -1954,13 +1954,13 @@ This method is recommended too if you are developing the C++ library and
 exporting it to Python at the same time: changes in a class will only demand
 the compilation of a single cpp, instead of the entire wrapper code.

-[note If you're exporting your classes with [@/libs/python/doc/pyste/index.html Pyste],
+[note If you're exporting your classes with [@../../../../pyste/index.html Pyste],
 take a look at the [^--multiple] option, that generates the wrappers in
 various files as demonstrated here.]

 [note This method is useful too if you are getting the error message
 ['"fatal error C1204:Compiler limit:internal structure overflow"] when compiling
-a large source file, as explained in the [@/libs/python/doc/v2/faq.html#c1204 FAQ].]
+a large source file, as explained in the [@../../../v2/faq.html#c1204 FAQ].]

 [endsect]
 [endsect] [/ General Techniques]
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -11,8 +11,8 @@
    <a href="doc/html/index.html">link</a> &nbsp;<hr>
    <p>© Copyright Beman Dawes, 2001</p>
    <p>Distributed under the Boost Software License, Version 1.0. (See 
-    accompanying file <a href="../../../../LICENSE_1_0.txt">
+    accompanying file <a href="../../../LICENSE_1_0.txt">
    LICENSE_1_0.txt</a> or copy at
    <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
  </body>
-</html>
+</html>
--- a/include/boost/python/converter/rvalue_from_python_data.hpp
+++ b/include/boost/python/converter/rvalue_from_python_data.hpp
@@ -117,9 +117,9 @@ struct rvalue_from_python_data : rvalue_from_python_storage<T>
 // Implementataions
 //
 template <class T>
-inline rvalue_from_python_data<T>::rvalue_from_python_data(rvalue_from_python_stage1_data const& _stage1)
+inline rvalue_from_python_data<T>::rvalue_from_python_data(rvalue_from_python_stage1_data const& stage1)
 {
-    this->stage1 = _stage1;
+    this->stage1 = stage1;
 }

 template <class T>
--- a/include/boost/python/data_members.hpp
+++ b/include/boost/python/data_members.hpp
@@ -265,8 +265,7 @@ inline object make_getter(D const& d, Policies const& policies)
 template <class D>
 inline object make_getter(D& x)
 {
-    detail::not_specified policy
-        = detail::not_specified(); // suppress a SunPro warning
+    detail::not_specified policy;
    return detail::make_getter(x, policy, is_member_pointer<D>(), 0L);
 }

@@ -274,8 +273,7 @@ inline object make_getter(D& x)
 template <class D>
 inline object make_getter(D const& d)
 {
-    detail::not_specified policy
-        = detail::not_specified(); // Suppress a SunPro warning
+    detail::not_specified policy;
    return detail::make_getter(d, policy, is_member_pointer<D>(), 0L);
 }
 #  endif
--- a/include/boost/python/iterator.hpp
+++ b/include/boost/python/iterator.hpp
@@ -14,16 +14,6 @@
 # include <boost/type_traits/cv_traits.hpp>
 # include <boost/type_traits/transform_traits.hpp>

-# if defined(BOOST_MSVC) && (BOOST_MSVC == 1400) /*
-> warning C4180: qualifier applied to function type has no meaning; ignored
-Peter Dimov wrote:
-This warning is caused by an overload resolution bug in VC8 that cannot be
-worked around and will probably not be fixed by MS in the VC8 line. The
-problematic overload is only instantiated and never called, and the code
-works correctly. */
-#  pragma warning(disable: 4180)
-# endif
-
 # include <boost/bind.hpp>
 # include <boost/bind/protect.hpp>

--- a/include/boost/python/object/class_metadata.hpp
+++ b/include/boost/python/object/class_metadata.hpp
@@ -236,7 +236,7 @@ struct class_metadata
    //
    // Support for converting smart pointers to python
    //
-    inline static void maybe_register_pointer_to_python(...) {}
+    inline static void maybe_register_pointer_to_python(void*,void*,void*) {}

 #ifndef BOOST_PYTHON_NO_PY_SYGNATURES
    inline static void maybe_register_pointer_to_python(void*,void*,mpl::true_*) 
--- a/include/boost/python/object/pointer_holder.hpp
+++ b/include/boost/python/object/pointer_holder.hpp
@@ -127,14 +127,7 @@ void* pointer_holder<Pointer, Value>::holds(type_info dst_t, bool null_ptr_only)
    )
        return &this->m_p;

-    Value* p
-#  if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
-        = static_cast<Value*>( get_pointer(this->m_p) )
-#  else 
-        = get_pointer(this->m_p)
-#  endif
-        ;
-    
+    Value* p = get_pointer(this->m_p);
    if (p == 0)
        return 0;
    
--- a/include/boost/python/object_protocol.hpp
+++ b/include/boost/python/object_protocol.hpp
@@ -10,11 +10,9 @@
 # include <boost/python/object_protocol_core.hpp>
 # include <boost/python/object_core.hpp>

-# include <boost/detail/workaround.hpp>
-
 namespace boost { namespace python { namespace api {

-# if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
+# if BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580)
 // attempt to use SFINAE to prevent functions accepting T const& from
 // coming up as ambiguous with the one taking a char const* when a
 // string literal is passed
@@ -24,45 +22,45 @@ namespace boost { namespace python { namespace api {
 # endif

 template <class Target, class Key>
-object getattr(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(Key))
+object getattr(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    return getattr(object(target), object(key));
 }

 template <class Target, class Key, class Default>
-object getattr(Target const& target, Key const& key, Default const& default_ BOOST_PYTHON_NO_ARRAY_ARG(Key))
+object getattr(Target const& target, Key const& key, Default const& default_ BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    return getattr(object(target), object(key), object(default_));
 }


 template <class Key, class Value>
-void setattr(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(Key))
+void setattr(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    setattr(target, object(key), object(value));
 }

 template <class Key>
-void delattr(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(Key))
+void delattr(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    delattr(target, object(key));
 }

 template <class Target, class Key>
-object getitem(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(Key))
+object getitem(Target const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    return getitem(object(target), object(key));
 }


 template <class Key, class Value>
-void setitem(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(Key))
+void setitem(object const& target, Key const& key, Value const& value BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    setitem(target, object(key), object(value));
 }

 template <class Key>
-void delitem(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(Key))
+void delitem(object const& target, Key const& key BOOST_PYTHON_NO_ARRAY_ARG(key))
 {
    delitem(target, object(key));
 }
--- a/include/boost/python/object_slices.hpp
+++ b/include/boost/python/object_slices.hpp
@@ -27,12 +27,6 @@ struct slice_policies : const_slice_policies
    static void del(object const& target, key_type const& key);
 };

-template <class T, class U>
-inline slice_policies::key_type slice_key(T x, U y)
-{
-    return slice_policies::key_type(handle<>(x), handle<>(y));
-}
-    
 //
 // implementation
 //
@@ -41,7 +35,7 @@ object_slice
 object_operators<U>::slice(object_cref start, object_cref finish)
 {
    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, api::slice_key(borrowed(start.ptr()), borrowed(finish.ptr())));
+    return object_slice(x, std::make_pair(borrowed(start.ptr()), borrowed(finish.ptr())));
 }

 template <class U>
@@ -49,7 +43,7 @@ const_object_slice
 object_operators<U>::slice(object_cref start, object_cref finish) const
 {
    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, api::slice_key(borrowed(start.ptr()), borrowed(finish.ptr())));
+    return const_object_slice(x, std::make_pair(borrowed(start.ptr()), borrowed(finish.ptr())));
 }

 template <class U>
@@ -57,7 +51,7 @@ object_slice
 object_operators<U>::slice(slice_nil, object_cref finish)
 {
    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, api::slice_key(allow_null((PyObject*)0), borrowed(finish.ptr())));
+    return object_slice(x, std::make_pair(allow_null((PyObject*)0), borrowed(finish.ptr())));
 }

 template <class U>
@@ -65,7 +59,7 @@ const_object_slice
 object_operators<U>::slice(slice_nil, object_cref finish) const
 {
    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, api::slice_key(allow_null((PyObject*)0), borrowed(finish.ptr())));
+    return const_object_slice(x, std::make_pair(allow_null((PyObject*)0), borrowed(finish.ptr())));
 }

 template <class U>
@@ -73,7 +67,7 @@ object_slice
 object_operators<U>::slice(slice_nil, slice_nil)
 {
    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, api::slice_key(allow_null((PyObject*)0), allow_null((PyObject*)0)));
+    return object_slice(x, std::make_pair(allow_null((PyObject*)0), allow_null((PyObject*)0)));
 }

 template <class U>
@@ -81,7 +75,7 @@ const_object_slice
 object_operators<U>::slice(slice_nil, slice_nil) const
 {
    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, api::slice_key(allow_null((PyObject*)0), allow_null((PyObject*)0)));
+    return const_object_slice(x, std::make_pair(allow_null((PyObject*)0), allow_null((PyObject*)0)));
 }

 template <class U>
@@ -89,7 +83,7 @@ object_slice
 object_operators<U>::slice(object_cref start, slice_nil)
 {
    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, api::slice_key(borrowed(start.ptr()), allow_null((PyObject*)0)));
+    return object_slice(x, std::make_pair(borrowed(start.ptr()), allow_null((PyObject*)0)));
 }

 template <class U>
@@ -97,7 +91,7 @@ const_object_slice
 object_operators<U>::slice(object_cref start, slice_nil) const
 {
    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, api::slice_key(borrowed(start.ptr()), allow_null((PyObject*)0)));
+    return const_object_slice(x, std::make_pair(borrowed(start.ptr()), allow_null((PyObject*)0)));
 }
 # if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
 template <class U>
--- a/include/boost/python/suite/indexing/container_utils.hpp
+++ b/include/boost/python/suite/indexing/container_utils.hpp
@@ -7,12 +7,9 @@
 #ifndef PY_CONTAINER_UTILS_JDG20038_HPP
 # define PY_CONTAINER_UTILS_JDG20038_HPP

-# include <utility>
-# include <boost/foreach.hpp>
 # include <boost/python/object.hpp>
 # include <boost/python/handle.hpp>
 # include <boost/python/extract.hpp>
-# include <boost/python/stl_iterator.hpp>

 namespace boost { namespace python { namespace container_utils {
        
@@ -22,13 +19,11 @@ namespace boost { namespace python { namespace container_utils {
    {
        typedef typename Container::value_type data_type;
        
-        //  l must be iterable
-        BOOST_FOREACH(object elem,
-            std::make_pair(
-              boost::python::stl_input_iterator<object>(l),
-              boost::python::stl_input_iterator<object>()
-              ))
+        //  l must be a list or some container
+
+        for (int i = 0; i < l.attr("__len__")(); i++)
        {
+            object elem(l[i]);
            extract<data_type const&> x(elem);
            //  try if elem is an exact data_type type
            if (x.check())
--- a/src/dict.cpp
+++ b/src/dict.cpp
@@ -29,7 +29,7 @@ namespace
 detail::new_reference dict_base::call(object const& arg_)
 {
    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyDict_Type, const_cast<char*>("(O)"), 
+        (PyObject*)&PyDict_Type, "(O)", 
        arg_.ptr());
 }

--- a/src/errors.cpp
+++ b/src/errors.cpp
@@ -41,10 +41,6 @@ BOOST_PYTHON_DECL bool handle_exception_impl(function0<void> f)
    {
        PyErr_SetString(PyExc_IndexError, x.what());
    }
-    catch(const std::invalid_argument& x)
-    {
-        PyErr_SetString(PyExc_ValueError, x.what());
-    }
    catch(const std::exception& x)
    {
        PyErr_SetString(PyExc_RuntimeError, x.what());
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -39,7 +39,7 @@ object BOOST_PYTHON_DECL exec_file(str filename, object global, object local)
  // should be 'char const *' but older python versions don't use 'const' yet.
  char *f = python::extract<char *>(filename);
  // Let python open the file to avoid potential binary incompatibilities.
-  PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
+  PyObject *pyfile = PyFile_FromString(f, "r");
  if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
  python::handle<> file(pyfile);
  PyObject* result = PyRun_File(PyFile_AsFile(file.get()),
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -13,7 +13,7 @@ detail::new_non_null_reference list_base::call(object const& arg_)
    return (detail::new_non_null_reference)
        (expect_non_null)(
            PyObject_CallFunction(
-                (PyObject*)&PyList_Type, const_cast<char*>("(O)"), 
+                (PyObject*)&PyList_Type, "(O)", 
                arg_.ptr()));
 }

--- a/src/long.cpp
+++ b/src/long.cpp
@@ -9,21 +9,21 @@ namespace boost { namespace python { namespace detail {
 new_non_null_reference long_base::call(object const& arg_)
 {
    return (detail::new_non_null_reference)PyObject_CallFunction(
-        (PyObject*)&PyLong_Type, const_cast<char*>("(O)"), 
+        (PyObject*)&PyLong_Type, "(O)", 
        arg_.ptr());
 }

 new_non_null_reference long_base::call(object const& arg_, object const& base)
 {
    return (detail::new_non_null_reference)PyObject_CallFunction(
-        (PyObject*)&PyLong_Type, const_cast<char*>("(OO)"), 
+        (PyObject*)&PyLong_Type, "(OO)", 
        arg_.ptr(), base.ptr());
 }

 long_base::long_base()
    : object(
        detail::new_reference(
-            PyObject_CallFunction((PyObject*)&PyLong_Type, const_cast<char*>("()")))
+            PyObject_CallFunction((PyObject*)&PyLong_Type, "()"))
        )
 {}

--- a/src/object/class.cpp
+++ b/src/object/class.cpp
@@ -74,7 +74,7 @@ extern "C"
  {
      propertyobject *gs = (propertyobject *)self;

-      return PyObject_CallFunction(gs->prop_get, const_cast<char*>("()"));
+      return PyObject_CallFunction(gs->prop_get, "()");
  }

  static int
@@ -95,9 +95,9 @@ extern "C"
          return -1;
      }
      if (value == NULL)
-          res = PyObject_CallFunction(func, const_cast<char*>("()"));
+          res = PyObject_CallFunction(func, "()");
      else
-          res = PyObject_CallFunction(func, const_cast<char*>("(O)"), value);
+          res = PyObject_CallFunction(func, "(O)", value);
      if (res == NULL)
          return -1;
      Py_DECREF(res);
@@ -108,7 +108,7 @@ extern "C"
 static PyTypeObject static_data_object = {
    PyObject_HEAD_INIT(0)//&PyType_Type)
    0,
-    const_cast<char*>("Boost.Python.StaticProperty"),
+    "Boost.Python.StaticProperty",
    PyType_Type.tp_basicsize,
    0,
    0,                                      /* tp_dealloc */
@@ -212,7 +212,7 @@ extern "C"
 static PyTypeObject class_metatype_object = {
    PyObject_HEAD_INIT(0)//&PyType_Type)
    0,
-    const_cast<char*>("Boost.Python.class"),
+    "Boost.Python.class",
    PyType_Type.tp_basicsize,
    0,
    0,                                      /* tp_dealloc */
@@ -316,7 +316,7 @@ namespace objects
      {
          // Attempt to find the __instance_size__ attribute. If not present, no problem.
          PyObject* d = type_->tp_dict;
-          PyObject* instance_size_obj = PyObject_GetAttrString(d, const_cast<char*>("__instance_size__"));
+          PyObject* instance_size_obj = PyObject_GetAttrString(d, "__instance_size__");

          long instance_size = instance_size_obj ? PyInt_AsLong(instance_size_obj) : 0;
          
@@ -357,20 +357,20 @@ namespace objects


  static PyGetSetDef instance_getsets[] = {
-      {const_cast<char*>("__dict__"),  instance_get_dict,  instance_set_dict, NULL, 0},
+      {"__dict__",  instance_get_dict,  instance_set_dict, NULL, 0},
      {0, 0, 0, 0, 0}
  };

  
  static PyMemberDef instance_members[] = {
-      {const_cast<char*>("__weakref__"), T_OBJECT, offsetof(instance<>, weakrefs), 0, 0},
+      {"__weakref__", T_OBJECT, offsetof(instance<>, weakrefs), 0, 0},
      {0, 0, 0, 0, 0}
  };

  static PyTypeObject class_type_object = {
      PyObject_HEAD_INIT(0) //&class_metatype_object)
      0,
-      const_cast<char*>("Boost.Python.instance"),
+      "Boost.Python.instance",
      offsetof(instance<>,storage),           /* tp_basicsize */
      1,                                      /* tp_itemsize */
      instance_dealloc,                       /* tp_dealloc */
@@ -572,7 +572,7 @@ namespace objects
  {
      object property(
          (python::detail::new_reference)
-          PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("Osss"), fget.ptr(), 0, 0, docstr));
+              PyObject_CallFunction((PyObject*)&PyProperty_Type, "Osss", fget.ptr(), 0, 0, docstr));
      
      this->setattr(name, property);
  }
@@ -582,7 +582,7 @@ namespace objects
  {
      object property(
          (python::detail::new_reference)
-          PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), 0, docstr));
+              PyObject_CallFunction((PyObject*)&PyProperty_Type, "OOss", fget.ptr(), fset.ptr(), 0, docstr));
      
      this->setattr(name, property);
  }
@@ -591,7 +591,7 @@ namespace objects
  {
      object property(
          (python::detail::new_reference)
-          PyObject_CallFunction(static_data(), const_cast<char*>("O"), fget.ptr()));
+          PyObject_CallFunction(static_data(), "O", fget.ptr()));
      
      this->setattr(name, property);
  }
@@ -600,7 +600,7 @@ namespace objects
  {
      object property(
          (python::detail::new_reference)
-          PyObject_CallFunction(static_data(), const_cast<char*>("OO"), fget.ptr(), fset.ptr()));
+          PyObject_CallFunction(static_data(), "OO", fget.ptr(), fset.ptr()));
      
      this->setattr(name, property);
  }
@@ -615,13 +615,13 @@ namespace objects
  {
    extern "C" PyObject* no_init(PyObject*, PyObject*)
    {
-        ::PyErr_SetString(::PyExc_RuntimeError, const_cast<char*>("This class cannot be instantiated from Python"));
+        ::PyErr_SetString(::PyExc_RuntimeError, "This class cannot be instantiated from Python");
        return NULL;
    }
    static ::PyMethodDef no_init_def = {
-        const_cast<char*>("__init__"), no_init, METH_VARARGS,
-        const_cast<char*>("Raises an exception\n"
-                          "This class cannot be instantiated from Python\n")
+        "__init__", no_init, METH_VARARGS,
+        "Raises an exception\n"
+        "This class cannot be instantiated from Python\n"
    };
  }
  
@@ -650,7 +650,7 @@ namespace objects

        ::PyErr_Format(
            PyExc_TypeError
-          , const_cast<char*>("staticmethod expects callable object; got an object of type %s, which is not callable")
+            , "staticmethod expects callable object; got an object of type %s, which is not callable"
            , callable->ob_type->tp_name
            );
        
--- a/src/object/enum.cpp
+++ b/src/object/enum.cpp
@@ -23,7 +23,7 @@ struct enum_object
 };

 static PyMemberDef enum_members[] = {
-    {const_cast<char*>("name"), T_OBJECT_EX, offsetof(enum_object,name),READONLY, 0},
+    {"name", T_OBJECT_EX, offsetof(enum_object,name),READONLY, 0},
    {0, 0, 0, 0, 0}
 };

@@ -32,7 +32,7 @@ extern "C"
 {
    static PyObject* enum_repr(PyObject* self_)
    {
-        const char *mod = PyString_AsString(PyObject_GetAttrString( self_, const_cast<char*>("__module__")));
+        const char *mod = PyString_AsString(PyObject_GetAttrString( self_, "__module__"));
        enum_object* self = downcast<enum_object>(self_);
        if (!self->name)
        {
@@ -65,7 +65,7 @@ extern "C"
 static PyTypeObject enum_type_object = {
    PyObject_HEAD_INIT(0) // &PyType_Type
    0,
-    const_cast<char*>("Boost.Python.enum"),
+    "Boost.Python.enum",
    sizeof(enum_object),                    /* tp_basicsize */
    0,                                      /* tp_itemsize */
    0,                                      /* tp_dealloc */
--- a/src/object/function.cpp
+++ b/src/object/function.cpp
@@ -297,7 +297,7 @@ object function::signatures(bool show_return_type) const
 void function::argument_error(PyObject* args, PyObject* /*keywords*/) const
 {
    static handle<> exception(
-        PyErr_NewException(const_cast<char*>("Boost.Python.ArgumentError"), PyExc_TypeError, 0));
+        PyErr_NewException("Boost.Python.ArgumentError", PyExc_TypeError, 0));

    object message = "Python argument types in\n    %s.%s("
        % make_tuple(this->m_namespace, this->m_name);
@@ -440,7 +440,7 @@ void function::add_to_namespace(
        else if (PyType_Check(ns))
            dict = ((PyTypeObject*)ns)->tp_dict;
        else    
-            dict = PyObject_GetAttrString(ns, const_cast<char*>("__dict__"));
+            dict = PyObject_GetAttrString(ns, "__dict__");

        if (dict == 0)
            throw_error_already_set();
@@ -487,7 +487,7 @@ void function::add_to_namespace(
            new_func->m_name = name;

        handle<> name_space_name(
-            allow_null(::PyObject_GetAttrString(name_space.ptr(), const_cast<char*>("__name__"))));
+            allow_null(::PyObject_GetAttrString(name_space.ptr(), "__name__")));
        
        if (name_space_name)
            new_func->m_namespace = object(name_space_name);
@@ -656,18 +656,18 @@ extern "C"
 }

 static PyGetSetDef function_getsetlist[] = {
-    {const_cast<char*>("__name__"), (getter)function_get_name, 0, 0, 0 },
-    {const_cast<char*>("func_name"), (getter)function_get_name, 0, 0, 0 },
-    {const_cast<char*>("__class__"), (getter)function_get_class, 0, 0, 0 },    // see note above
-    {const_cast<char*>("__doc__"), (getter)function_get_doc, (setter)function_set_doc, 0, 0},
-    {const_cast<char*>("func_doc"), (getter)function_get_doc, (setter)function_set_doc, 0, 0},
+    {"__name__", (getter)function_get_name, 0, 0, 0 },
+    {"func_name", (getter)function_get_name, 0, 0, 0 },
+    {"__class__", (getter)function_get_class, 0, 0, 0 },    // see note above
+    {"__doc__", (getter)function_get_doc, (setter)function_set_doc, 0, 0},
+    {"func_doc", (getter)function_get_doc, (setter)function_set_doc, 0, 0},
    {NULL, 0, 0, 0, 0} /* Sentinel */
 };

 PyTypeObject function_type = {
    PyObject_HEAD_INIT(0)
    0,
-    const_cast<char*>("Boost.Python.function"),
+    "Boost.Python.function",
    sizeof(function),
    0,
    (destructor)function_dealloc,               /* tp_dealloc */
@@ -753,8 +753,7 @@ namespace detail
  }
  void BOOST_PYTHON_DECL pure_virtual_called()
  {
-      PyErr_SetString(
-          PyExc_RuntimeError, const_cast<char*>("Pure virtual function called"));
+      PyErr_SetString(PyExc_RuntimeError, "Pure virtual function called");
      throw_error_already_set();
  }
 }
--- a/src/object/life_support.cpp
+++ b/src/object/life_support.cpp
@@ -38,7 +38,7 @@ extern "C"
 PyTypeObject life_support_type = {
    PyObject_HEAD_INIT(0)//(&PyType_Type)
    0,
-    const_cast<char*>("Boost.Python.life_support"),
+    "Boost.Python.life_support",
    sizeof(life_support),
    0,
    life_support_dealloc,               /* tp_dealloc */
--- a/src/object/stl_iterator.cpp
+++ b/src/object/stl_iterator.cpp
@@ -2,10 +2,6 @@
 // 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)
-//
-// Credits:
-//   Andreas Kl\:ockner for fixing increment() to handle
-//   error conditions.

 #include <boost/python/object.hpp>
 #include <boost/python/handle.hpp>
@@ -31,8 +27,6 @@ void stl_input_iterator_impl::increment()
 {
    this->ob_ = boost::python::handle<>(
        boost::python::allow_null(PyIter_Next(this->it_.ptr())));
-    if (PyErr_Occurred())
-        throw boost::python::error_already_set();
 }

 bool stl_input_iterator_impl::equal(stl_input_iterator_impl const &that) const
--- a/src/str.cpp
+++ b/src/str.cpp
@@ -10,7 +10,7 @@ namespace boost { namespace python { namespace detail {
 detail::new_reference str_base::call(object const& arg_)
 {
    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyString_Type, const_cast<char*>("(O)"), 
+        (PyObject*)&PyString_Type, "(O)", 
        arg_.ptr());
 } 

@@ -68,9 +68,8 @@ str str_base:: name ( BOOST_PP_ENUM_PARAMS(arity, object_cref x) ) const
    return str(new_reference(                                                   \
       expect_non_null(                                                         \
           PyObject_CallMethod(                                                 \
-               this->ptr(), const_cast<char*>( #name ),                         \
-               const_cast<char*>(                                               \
-                 "(" BOOST_PP_REPEAT(arity, BOOST_PYTHON_FORMAT_OBJECT, _) ")") \
+               this->ptr(), #name,                                              \
+              "(" BOOST_PP_REPEAT(arity, BOOST_PYTHON_FORMAT_OBJECT, _) ")"     \
               BOOST_PP_REPEAT_1(arity, BOOST_PYTHON_OBJECT_PTR, _)))));        \
 }

--- a/src/tuple.cpp
+++ b/src/tuple.cpp
@@ -9,7 +9,7 @@ namespace boost { namespace python { namespace detail {
 detail::new_reference tuple_base::call(object const& arg_)
 {
    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyTuple_Type, const_cast<char*>("(O)"), 
+        (PyObject*)&PyTuple_Type, "(O)", 
        arg_.ptr());
 }
    
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -42,7 +42,7 @@ test-suite python
  :

  [
-    run exec.cpp /boost/python//boost_python/<link>static $(PY)
+    run exec.cpp ../build//boost_python/<link>static $(PY)
      : # program args
      : exec.py # input files
      : # requirements
@@ -171,8 +171,7 @@ bpl-test crossmod_opaque
    /boost/python//boost_python ]
 [ bpl-test  
    map_indexing_suite : map_indexing_suite.py map_indexing_suite_ext ]
-      
-[ run import_.cpp /boost/python//boost_python $(PY) : : import_.py ]
+[ py-run import_.cpp : import_.py ]

 # if $(TEST_BIENSTMAN_NON_BUGS)
 # {
--- a/test/andreas_beyer.cpp
+++ b/test/andreas_beyer.cpp
@@ -25,8 +25,8 @@ class B {
    B() {
       a = A::A_ptr(new A());
    }
-    void set(A::A_ptr _a) {
-      this->a = _a;
+    void set(A::A_ptr a) {
+      this->a = a;
    }
    A::A_ptr get() {
       return a;
--- a/test/args.cpp
+++ b/test/args.cpp
@@ -14,7 +14,7 @@

 using namespace boost::python;

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

--- a/test/back_reference.cpp
+++ b/test/back_reference.cpp
@@ -27,7 +27,7 @@ struct X
    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
    virtual ~X() { BOOST_ASSERT(magic == 7654321); magic = 6666666; x = 9999; --counter; }

-    void set(int _x) { BOOST_ASSERT(magic == 7654321); this->x = _x; }
+    void set(int x) { BOOST_ASSERT(magic == 7654321); this->x = x; }
    int value() const { BOOST_ASSERT(magic == 7654321); return x; }
    static int count() { return counter; }
 private:
--- a/test/callbacks.cpp
+++ b/test/callbacks.cpp
@@ -34,7 +34,7 @@ struct X
    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
    ~X() { BOOST_ASSERT(magic == 7654321); magic = 6666666; x = 9999; --counter; }

-    void set(int _x) { BOOST_ASSERT(magic == 7654321); this->x = _x; }
+    void set(int x) { BOOST_ASSERT(magic == 7654321); this->x = x; }
    int value() const { BOOST_ASSERT(magic == 7654321); return x; }
    static int count() { return counter; }
 private:
--- a/test/complicated.hpp
+++ b/test/complicated.hpp
@@ -19,10 +19,10 @@ struct complicated
    int n;
 };

-inline complicated::complicated(simple const&s, int _n)
-    : s(s.s), n(_n)
+inline complicated::complicated(simple const&s, int n)
+    : s(s.s), n(n)
 {
-    std::cout << "constructing complicated: " << this->s << ", " << _n << std::endl;
+    std::cout << "constructing complicated: " << this->s << ", " << n << std::endl;
 }

 inline complicated::~complicated()
--- a/test/exec.cpp
+++ b/test/exec.cpp
@@ -59,7 +59,7 @@ void eval_test()
 void exec_test()
 {
  // Register the module with the interpreter
-  if (PyImport_AppendInittab(const_cast<char*>("embedded_hello"), initembedded_hello) == -1)
+  if (PyImport_AppendInittab("embedded_hello", initembedded_hello) == -1)
    throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
                 "builtin modules");
  // Retrieve the main module
--- a/test/m1.cpp
+++ b/test/m1.cpp
@@ -34,7 +34,7 @@ struct NoddyObject : PyObject
 PyTypeObject NoddyType = {
    PyObject_HEAD_INIT(NULL)
    0,
-    const_cast<char*>("Noddy"),
+    "Noddy",
    sizeof(NoddyObject),
    0,
    dealloc,    /* tp_dealloc */
@@ -106,7 +106,7 @@ struct extract_simple_object
 PyTypeObject SimpleType = {
    PyObject_HEAD_INIT(NULL)
    0,
-    const_cast<char*>("Simple"),
+    "Simple",
    sizeof(SimpleObject),
    0,
    dealloc,    /* tp_dealloc */
@@ -159,7 +159,7 @@ PyTypeObject SimpleType = {
 PyObject* new_simple()
 {
    SimpleObject* simple = PyObject_New(SimpleObject, &SimpleType);
-    simple->x.s = const_cast<char*>("hello, world");
+    simple->x.s = "hello, world";
    return (PyObject*)simple;
 }

--- a/test/numpy.cpp
+++ b/test/numpy.cpp
@@ -10,16 +10,19 @@
 #include <boost/python/str.hpp>

 using namespace boost::python;
-namespace py = boost::python;
+
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+# define make_tuple boost::python::make_tuple
+#endif 

 // See if we can invoke array() from C++
 numeric::array new_array()
 {
    return numeric::array(
-        py::make_tuple(
-            py::make_tuple(1,2,3)
-          , py::make_tuple(4,5,6)
-          , py::make_tuple(7,8,9)
+        make_tuple(
+            make_tuple(1,2,3)
+          , make_tuple(4,5,6)
+          , make_tuple(7,8,9)
            )
        );
 }
@@ -48,7 +51,7 @@ namespace
      str format("exception type: %sn");                                 
      format += "exception value: %sn";                                  
      format += "traceback:n%s" ;                                        
-      object ret = format % py::make_tuple(ty, v, tr);
+      object ret = format % boost::python::make_tuple(ty, v, tr);
      return ret;
  }
 }
@@ -68,7 +71,7 @@ namespace
 // inherits that behavior from object.
 void exercise(numeric::array& y, object check)
 {
-    y[py::make_tuple(2,1)] = 3;
+    y[make_tuple(2,1)] = 3;
    CHECK(y);
    CHECK(y.astype('D'));
    CHECK(y.copy());
@@ -113,12 +116,12 @@ void exercise_numarray(numeric::array& y, object check)
    CHECK(y);
    CHECK(y.type());

-    CHECK(y.factory(py::make_tuple(1.2, 3.4)));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8"));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false));
-    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object()));
-    CHECK (y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object(), py::make_tuple(1,2,1)));
+    CHECK(y.factory(make_tuple(1.2, 3.4)));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8"));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false));
+    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false, object()));
+    CHECK (y.factory(make_tuple(1.2, 3.4), "f8", true, false, object(), make_tuple(1,2,1)));

 }

--- a/test/pickle1.cpp
+++ b/test/pickle1.cpp
@@ -27,8 +27,8 @@ namespace boost_python_test {
    private:
      std::string country;
    public:
-      world(const std::string& _country) {
-        this->country = _country;
+      world(const std::string& country) {
+        this->country = country;
      }
      std::string greet() const { return "Hello from " + country + "!"; }
      std::string get_country() const { return country; }
--- a/test/pickle2.cpp
+++ b/test/pickle2.cpp
@@ -34,8 +34,8 @@ namespace boost_python_test {
  class world
  {
    public:
-      world(const std::string& _country) : secret_number(0) {
-        this->country = _country;
+      world(const std::string& country) : secret_number(0) {
+        this->country = country;
      }
      std::string greet() const { return "Hello from " + country + "!"; }
      std::string get_country() const { return country; }
--- a/test/pickle3.cpp
+++ b/test/pickle3.cpp
@@ -25,7 +25,7 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/back_reference.hpp>

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

@@ -35,8 +35,8 @@ namespace boost_python_test {
  class world
  {
    public:
-      world(const std::string& _country) : secret_number(0) {
-        this->country = _country;
+      world(const std::string& country) : secret_number(0) {
+        this->country = country;
      }
      std::string greet() const { return "Hello from " + country + "!"; }
      std::string get_country() const { return country; }
--- a/test/pickle4.cpp
+++ b/test/pickle4.cpp
@@ -23,8 +23,8 @@ namespace boost_python_test {
    private:
      std::string country;
    public:
-      world(const std::string& _country) {
-        this->country = _country;
+      world(const std::string& country) {
+        this->country = country;
      }
      std::string greet() const { return "Hello from " + country + "!"; }
      std::string get_country() const { return country; }
--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -10,7 +10,7 @@

 using namespace boost::python;

-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
 # define make_tuple boost::python::make_tuple
 #endif 

@@ -100,11 +100,7 @@ bool accept_slice( slice) { return true; }
    || BOOST_WORKAROUND( BOOST_INTEL_WIN, == 710)
 int check_slice_get_indicies(slice index);
 #endif
-int check_slice_get_indicies(
-#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
-    const
-#endif 
-    slice index)
+int check_slice_get_indicies(const slice index)
 {
    // A vector of integers from [-5, 5].
    std::vector<int> coll(11);
--- a/test/staticmethod.cpp
+++ b/test/staticmethod.cpp
@@ -20,7 +20,7 @@ struct X
    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
    virtual ~X() { BOOST_ASSERT(magic == 7654321); magic = 6666666; x = 9999; --counter; }

-    void set(int _x) { BOOST_ASSERT(magic == 7654321); this->x = _x; }
+    void set(int x) { BOOST_ASSERT(magic == 7654321); this->x = x; }
    int value() const { BOOST_ASSERT(magic == 7654321); return x; }
    static int count() { return counter; }
 private:
--- a/test/stl_iterator.py
+++ b/test/stl_iterator.py
@@ -12,16 +12,6 @@
 3
 4
 5
->>> def generator():
-...   yield 1
-...   yield 2
-...   raise RuntimeError, "oops"
->>> try:
-...   x.assign(iter(generator()))
-...   print "NOT OK"
-... except RuntimeError:
-...   print "OK"
-OK
 '''
 def run(args = None):
    import sys
--- a/test/test_class.hpp
+++ b/test/test_class.hpp
@@ -13,7 +13,7 @@ struct test_class
    test_class(test_class const& rhs) : x(rhs.x), magic(7654321 + n) { ++counter; }
    virtual ~test_class() { BOOST_TEST(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }

-    void set(int _x) { BOOST_TEST(magic == 7654321 + n); this->x = _x; }
+    void set(int x) { BOOST_TEST(magic == 7654321 + n); this->x = x; }
    int value() const { BOOST_TEST(magic == 7654321 + n); return x; }
    operator int() const { return x; }
    static int count() { return counter; }
--- a/test/test_pointer_adoption.cpp
+++ b/test/test_pointer_adoption.cpp
@@ -65,7 +65,7 @@ struct B
    B() : x(0) {}
    B(A* x_) : x(x_) {}

-    inner const* adopt(A* _x) { this->x = _x; return &_x->get_inner(); }
+    inner const* adopt(A* x) { this->x = x; return &x->get_inner(); }

    std::string a_content()
    {
--- a/test/vector_indexing_suite.py
+++ b/test/vector_indexing_suite.py
@@ -321,19 +321,6 @@ e
 >>> print_xvec(v)
 [ a b c d e f g h i j ]

-#####################################################################
-# extend using a generator expression
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
->>> def generator():
-...   addlist = ['f','g','h','i','j']
-...   for i in addlist:
-...     if i != 'g':
-...       yield i
->>> v.extend(generator())
->>> print_xvec(v)
-[ a b c d e f h i j ]
-
 #####################################################################
 # vector of strings
 #####################################################################
--- a/test/virtual_functions.cpp
+++ b/test/virtual_functions.cpp
@@ -22,7 +22,7 @@ struct X
    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
    virtual ~X() { BOOST_ASSERT(magic == 7654321); magic = 6666666; x = 9999; --counter; }

-    void set(int _x) { BOOST_ASSERT(magic == 7654321); this->x = _x; }
+    void set(int x) { BOOST_ASSERT(magic == 7654321); this->x = x; }
    int value() const { BOOST_ASSERT(magic == 7654321); return x; }
    static int count() { return counter; }
 private:
Author	SHA1	Message	Date
Beman Dawes	5e2cc1541f	Version 1.35.0 RC3 [SVN r43909]	2008-03-28 13:24:38 +00:00
Beman Dawes	694ae13063	Merge from trunk 43901 at Dave's request [SVN r43902]	2008-03-28 02:16:12 +00:00
Joel de Guzman	5168895803	Added note about --preserve-test-targets [SVN r43849]	2008-03-24 23:04:36 +00:00
Joel de Guzman	c8bf94663c	Added note about --preserve-test-targets [SVN r43848]	2008-03-24 23:02:57 +00:00
Daniel James	928a9389ce	Rebuild a lot of documentation. [SVN r43650]	2008-03-16 11:38:32 +00:00
Daniel James	7d22435994	Merged revisions 43211,43214-43219,43222-43225,43227-43238,43242,43244-43245,43249-43250,43257-43259,43261,43263,43265,43267-43268,43270-43271,43273,43275-43279,43284-43289,43291,43295,43297-43298,43304-43305,43307,43313,43315,43324,43326-43327,43331,43333,43339-43343,43345,43348,43350,43352-43353,43355-43356,43358,43360,43366-43367,43369-43370,43372-43376,43378-43389,43394,43396-43398,43400-43401,43403-43404,43406-43408,43413-43415,43417-43418,43420,43422-43423 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r43417 \| danieljames \| 2008-02-26 22:04:55 +0000 (Tue, 26 Feb 2008) \| 2 lines Fix a link to Boost.Bimap. ........ r43418 \| danieljames \| 2008-02-26 22:07:25 +0000 (Tue, 26 Feb 2008) \| 2 lines Change another link that's no longer in the repository to link to the website. ........ r43422 \| danieljames \| 2008-02-27 18:51:14 +0000 (Wed, 27 Feb 2008) \| 1 line Fix broken copyright urls. Fixes #1573. ........ r43423 \| danieljames \| 2008-02-27 19:22:01 +0000 (Wed, 27 Feb 2008) \| 1 line Fix incorrect links to copyright of the form 'http:#www.boost.org ........ [SVN r43425]	2008-02-27 20:00:24 +00:00
Daniel James	96dd880146	Merged revisions 43206,43208-43213 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r43206 \| danieljames \| 2008-02-10 09:55:03 +0000 (Sun, 10 Feb 2008) \| 1 line Fix some broken links. ........ r43209 \| danieljames \| 2008-02-10 14:56:22 +0000 (Sun, 10 Feb 2008) \| 1 line Link to people pages on the website, as they've been removed from the download. ........ r43210 \| danieljames \| 2008-02-10 15:02:17 +0000 (Sun, 10 Feb 2008) \| 1 line Point links to the pages that used to be in 'more' to the site. ........ r43212 \| danieljames \| 2008-02-10 16:10:16 +0000 (Sun, 10 Feb 2008) \| 1 line Fix links on the home page as well. ........ r43213 \| danieljames \| 2008-02-10 16:21:22 +0000 (Sun, 10 Feb 2008) \| 1 line Generated documentation which is no longer generated. ........ [SVN r43214]	2008-02-10 16:39:38 +00:00
Jürgen Hunold	63f8e9f3d7	Merged revisions 41544-41546,41549-41551,41558-41561,41564,41567,41570,41573,41576-41579,41581,41583-41586,41589,41591,41594-41612,41614-41620,41622-41624,41628,41630-41635,41637,41640-41641,41643,41649-41650 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r41544 \| jhunold \| 2007-12-01 20:27:06 +0100 (Sa, 01 Dez 2007) \| 2 lines Silence compiler by adding cosmetic virtual destructors. ........ r41549 \| jhunold \| 2007-12-01 21:24:51 +0100 (Sa, 01 Dez 2007) \| 2 lines Silence compiler by adding cosmetic virtual destructors. ........ r41550 \| jhunold \| 2007-12-01 21:26:37 +0100 (Sa, 01 Dez 2007) \| 3 lines Remove unused paramters. Add -Wextra to gcc flags to enable more warnings. ........ r41577 \| jhunold \| 2007-12-02 12:51:08 +0100 (So, 02 Dez 2007) \| 3 lines Revert revisions 41544 and 41549. See http://lists.boost.org/Archives/boost/2007/12/131116.php for details. ........ r41649 \| jhunold \| 2007-12-03 19:47:17 +0100 (Mo, 03 Dez 2007) \| 2 lines Silence unused paramter warning in release mode. ........ r41650 \| jhunold \| 2007-12-03 19:51:26 +0100 (Mo, 03 Dez 2007) \| 2 lines Add cosmetic virtual detructors to silence compile warnings. ........ [SVN r42094]	2007-12-16 10:12:07 +00:00
Beman Dawes	d9b4ada654	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41370]	2007-11-25 18:38:02 +00:00
Beman Dawes	f5df393360	Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369]	2007-11-25 18:07:19 +00:00
Rene Rivera	bf33b54638	Recreate release branch from fixed 1.34.1 tag. [SVN r40341]	2007-10-23 06:42:50 +00:00
Douglas Gregor	87451007b9	Move Attic files back into their rightful places [SVN r40311]	2007-10-23 01:47:48 +00:00
Beman Dawes	2392a6a3e2	Starting point for releases [SVN r39706]	2007-10-05 14:25:06 +00:00
nobody	6c1e7decfa	This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286]	2007-07-24 19:28:14 +00:00