diff --git a/doc/v2/slice.html b/doc/v2/slice.html
index 8831d971..fb6b47c7 100644
--- a/doc/v2/slice.html
+++ b/doc/v2/slice.html
@@ -85,7 +85,7 @@ namespace boost { namespace python
object stop();
object step();
- // The return type of slice::get_indicies()
+ // The return type of slice::get_indices()
template <typename RandomAccessIterator>
struct range
{
@@ -96,7 +96,7 @@ namespace boost { namespace python
template <typename RandomAccessIterator>
range<RandomAccessIterator>
- get_indicies(
+ get_indices(
RandomAccessIterator const& begin,
RandomAccessIterator const& end);
};
@@ -164,7 +164,7 @@ slice object, but in practice they are usually integers.
template <typename RandomAccessIterator>
slice::range<RandomAccessIterator>
-slice::get_indicies(
+slice::get_indices(
RandomAccessIterator const& begin,
RandomAccessIterator const& end) const;
@@ -173,8 +173,8 @@ slice::get_indicies(
Iterators that form a half-open range.
Effects: Create a RandomAccessIterator pair that defines a
fully-closed range within the [begin,end) range of its arguments.
-This function translates this slice's indicies while accounting for the
-effects of any PyNone or negative indicies, and non-singular step sizes.
+This function translates this slice's indices while accounting for the
+effects of any PyNone or negative indices, and non-singular step sizes.
Returns: a slice::range
that has been initialized with a non-zero value of step and a pair of
RandomAccessIterators that point within the range of this functions
@@ -182,7 +182,7 @@ arguments and define a closed interval.
Throws: Raises a Python TypeError exception if any of this slice's arguments
are neither references to PyNone nor convertible to int. Throws
std::invalid_argument if the resulting range would be empty. You
-should always wrap calls to slice::get_indicies()
+should always wrap calls to slice::get_indices()
within try { ...; } catch (std::invalid_argument) {} to
handle this case and take appropriate action.
Rationale: closed-interval: If
@@ -221,7 +221,7 @@ double partial_sum(std::vector<double> const& Foo, const slice index)
{
slice::range<std::vector<double>::const_iterator> bounds;
try {
- bounds = index.get_indicies<>(Foo.begin(), Foo.end());
+ bounds = index.get_indices<>(Foo.begin(), Foo.end());
}
catch (std::invalid_argument) {
return 0.0;
diff --git a/doc/v2/with_custodian_and_ward.html b/doc/v2/with_custodian_and_ward.html
index 5f03b3b1..b8e2a498 100644
--- a/doc/v2/with_custodian_and_ward.html
+++ b/doc/v2/with_custodian_and_ward.html
@@ -91,7 +91,7 @@
This header provides faciliites for establishing a lifetime
+ This header provides facilities for establishing a lifetime
dependency between two of a function's Python argument or result objects.
The ward object will not be destroyed until after the custodian as
long as the custodian object supports > >::failed test0;
+ // https://svn.boost.org/trac/boost/ticket/5803
+ //typedef typename assertion > >::failed test0;
# if !BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
typedef typename assertion >::failed test1;
# endif
diff --git a/include/boost/python/detail/make_keyword_range_fn.hpp b/include/boost/python/detail/make_keyword_range_fn.hpp
index 634bbb99..c4795cf8 100644
--- a/include/boost/python/detail/make_keyword_range_fn.hpp
+++ b/include/boost/python/detail/make_keyword_range_fn.hpp
@@ -57,7 +57,7 @@ object make_keyword_range_constructor(
, Holder* = 0
, ArgList* = 0, Arity* = 0)
{
-#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SYGNATURES_PROPER_INIT_SELF_TYPE)
+#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE)
python_class::register_();
#endif
return detail::make_keyword_range_function(
diff --git a/include/boost/python/object/class_metadata.hpp b/include/boost/python/object/class_metadata.hpp
index 0738bbe3..155ae35d 100644
--- a/include/boost/python/object/class_metadata.hpp
+++ b/include/boost/python/object/class_metadata.hpp
@@ -238,7 +238,7 @@ struct class_metadata
//
inline static void maybe_register_pointer_to_python(...) {}
-#ifndef BOOST_PYTHON_NO_PY_SYGNATURES
+#ifndef BOOST_PYTHON_NO_PY_SIGNATURES
inline static void maybe_register_pointer_to_python(void*,void*,mpl::true_*)
{
objects::copy_class_object(python::type_id(), python::type_id >());
@@ -255,7 +255,7 @@ struct class_metadata
, make_ptr_instance >
>()
);
-#ifndef BOOST_PYTHON_NO_PY_SYGNATURES
+#ifndef BOOST_PYTHON_NO_PY_SIGNATURES
// explicit qualification of type_id makes msvc6 happy
objects::copy_class_object(python::type_id(), python::type_id());
#endif
@@ -270,7 +270,7 @@ struct class_metadata
inline static void maybe_register_class_to_python(T2*, mpl::false_)
{
python::detail::force_instantiate(class_cref_wrapper >());
-#ifndef BOOST_PYTHON_NO_PY_SYGNATURES
+#ifndef BOOST_PYTHON_NO_PY_SIGNATURES
// explicit qualification of type_id makes msvc6 happy
objects::copy_class_object(python::type_id(), python::type_id());
#endif
diff --git a/include/boost/python/object/make_holder.hpp b/include/boost/python/object/make_holder.hpp
index eb3c603d..0d54dd9f 100644
--- a/include/boost/python/object/make_holder.hpp
+++ b/include/boost/python/object/make_holder.hpp
@@ -12,7 +12,7 @@
# include
# include
-#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SYGNATURES_PROPER_INIT_SELF_TYPE)
+#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE)
# include
#endif
@@ -81,7 +81,7 @@ struct make_holder
# endif
static void execute(
-#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SYGNATURES_PROPER_INIT_SELF_TYPE)
+#if !defined( BOOST_PYTHON_NO_PY_SIGNATURES) && defined( BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE)
boost::python::detail::python_class *p
#else
PyObject *p
diff --git a/include/boost/python/slice.hpp b/include/boost/python/slice.hpp
index 382ceb81..4fc62418 100644
--- a/include/boost/python/slice.hpp
+++ b/include/boost/python/slice.hpp
@@ -30,7 +30,7 @@ namespace detail
// that created this slice, than that parameter is None here, and compares
// equal to a default-constructed boost::python::object.
// If a user-defined type wishes to support slicing, then support for the
- // special meaning associated with negative indicies is up to the user.
+ // special meaning associated with negative indices is up to the user.
object start() const;
object stop() const;
object step() const;
@@ -63,7 +63,7 @@ class slice : public detail::slice_base
// The following algorithm is intended to automate the process of
// determining a slice range when you want to fully support negative
- // indicies and non-singular step sizes. Its functionallity is simmilar to
+ // indices and non-singular step sizes. Its functionallity is simmilar to
// PySlice_GetIndicesEx() in the Python/C API, but tailored for C++ users.
// This template returns a slice::range struct that, when used in the
// following iterative loop, will traverse a slice of the function's
@@ -110,7 +110,7 @@ class slice : public detail::slice_base
template
slice::range
- get_indicies( const RandomAccessIterator& begin,
+ get_indices( const RandomAccessIterator& begin,
const RandomAccessIterator& end) const
{
// This is based loosely on PySlice_GetIndicesEx(), but it has been
@@ -240,6 +240,16 @@ class slice : public detail::slice_base
return ret;
}
+
+ // Incorrect spelling. DO NOT USE. Only here for backward compatibility.
+ // Corrected 2011-06-14.
+ template
+ slice::range
+ get_indicies( const RandomAccessIterator& begin,
+ const RandomAccessIterator& end) const
+ {
+ get_indices(begin, end);
+ }
public:
// This declaration, in conjunction with the specialization of
diff --git a/src/object/function.cpp b/src/object/function.cpp
index 9328e014..5c59cc77 100644
--- a/src/object/function.cpp
+++ b/src/object/function.cpp
@@ -433,23 +433,23 @@ void function::add_to_namespace(
if (attribute.ptr()->ob_type == &function_type)
{
function* new_func = downcast(attribute.ptr());
- PyObject* dict = 0;
+ handle<> dict;
#if PY_VERSION_HEX < 0x03000000
// Old-style class gone in Python 3
if (PyClass_Check(ns))
- dict = ((PyClassObject*)ns)->cl_dict;
+ dict = handle<>(borrowed(((PyClassObject*)ns)->cl_dict));
else
#endif
if (PyType_Check(ns))
- dict = ((PyTypeObject*)ns)->tp_dict;
+ dict = handle<>(borrowed(((PyTypeObject*)ns)->tp_dict));
else
- dict = PyObject_GetAttrString(ns, const_cast("__dict__"));
+ dict = handle<>(PyObject_GetAttrString(ns, const_cast("__dict__")));
if (dict == 0)
throw_error_already_set();
- handle<> existing(allow_null(::PyObject_GetItem(dict, name.ptr())));
+ handle<> existing(allow_null(::PyObject_GetItem(dict.get(), name.ptr())));
if (existing)
{
diff --git a/test/slice.cpp b/test/slice.cpp
index 032bf7cf..5072d7f7 100644
--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -98,9 +98,9 @@ bool accept_slice( slice) { return true; }
#if BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1400)) \
|| BOOST_WORKAROUND( BOOST_INTEL_WIN, == 710)
-int check_slice_get_indicies(slice index);
+int check_slice_get_indices(slice index);
#endif
-int check_slice_get_indicies(
+int check_slice_get_indices(
#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
const
#endif
@@ -116,7 +116,7 @@ int check_slice_get_indicies(
slice::range::iterator> bounds;
try {
- bounds = index.get_indicies(coll.begin(), coll.end());
+ bounds = index.get_indices(coll.begin(), coll.end());
}
catch (std::invalid_argument) {
return 0;
@@ -136,5 +136,5 @@ BOOST_PYTHON_MODULE(slice_ext)
def( "accept_slice", accept_slice);
def( "check_numeric_array_rich_slice", check_numeric_array_rich_slice);
def( "check_string_rich_slice", check_string_rich_slice);
- def( "check_slice_get_indicies", check_slice_get_indicies);
+ def( "check_slice_get_indices", check_slice_get_indices);
}
diff --git a/test/slice.py b/test/slice.py
index c281845b..95f4883b 100644
--- a/test/slice.py
+++ b/test/slice.py
@@ -37,17 +37,17 @@ test passed
... print 1
...
1
->>> check_slice_get_indicies( slice(None))
+>>> check_slice_get_indices( slice(None))
0
->>> check_slice_get_indicies( slice(2,-2))
+>>> check_slice_get_indices( slice(2,-2))
0
->>> check_slice_get_indicies( slice(2, None, 2))
+>>> check_slice_get_indices( slice(2, None, 2))
5
->>> check_slice_get_indicies( slice(2, None, -1))
+>>> check_slice_get_indices( slice(2, None, -1))
-12
->>> check_slice_get_indicies( slice( 20, None))
+>>> check_slice_get_indices( slice( 20, None))
0
->>> check_slice_get_indicies( slice( -2, -5, -2))
+>>> check_slice_get_indices( slice( -2, -5, -2))
6
"""