Merge 86392 from trunk. The spirit change was not applied because the file is not present in branches/release.

[SVN r86489]
2026-01-19 16:32:16 +00:00 · 2013-10-27 21:10:04 +00:00
97 changed files with 10 additions and 2 deletions
--- a/build/Attic/python_v1.zip
+++ b/build/Attic/python_v1.zip
--- a/doc/PyConDC_2003/bpl.html
+++ b/doc/PyConDC_2003/bpl.html
--- a/doc/PyConDC_2003/bpl.pdf
+++ b/doc/PyConDC_2003/bpl.pdf
--- a/doc/PyConDC_2003/python_cpp_mix.jpg
+++ b/doc/PyConDC_2003/python_cpp_mix.jpg
--- a/doc/PyConDC_2003/python_cpp_mix.png
+++ b/doc/PyConDC_2003/python_cpp_mix.png
--- a/doc/internals.html
+++ b/doc/internals.html
--- a/doc/internals.rst
+++ b/doc/internals.rst
--- a/doc/tutorial/doc/html/images/alert.png
+++ b/doc/tutorial/doc/html/images/alert.png
--- a/doc/tutorial/doc/html/images/home.png
+++ b/doc/tutorial/doc/html/images/home.png
--- a/doc/tutorial/doc/html/images/next.png
+++ b/doc/tutorial/doc/html/images/next.png
--- a/doc/tutorial/doc/html/images/note.png
+++ b/doc/tutorial/doc/html/images/note.png
--- a/doc/tutorial/doc/html/images/prev.png
+++ b/doc/tutorial/doc/html/images/prev.png
--- a/doc/tutorial/doc/html/images/tip.png
+++ b/doc/tutorial/doc/html/images/tip.png
--- a/doc/tutorial/doc/html/images/up.png
+++ b/doc/tutorial/doc/html/images/up.png
--- a/doc/v2/instance_holder.html
+++ b/doc/v2/instance_holder.html
--- a/doc/v2/lvalue_from_pytype.html
+++ b/doc/v2/lvalue_from_pytype.html
--- a/doc/v2/operators.html
+++ b/doc/v2/operators.html
--- a/doc/v2/raw_function.html
+++ b/doc/v2/raw_function.html
--- a/doc/v2/return_arg.html
+++ b/doc/v2/return_arg.html
--- a/doc/v2/stl_iterator.html
+++ b/doc/v2/stl_iterator.html
--- a/doc/v2/type_id.html
+++ b/doc/v2/type_id.html
--- a/doc/v2/wrapper.html
+++ b/doc/v2/wrapper.html
--- a/example/Jamroot
+++ b/example/Jamroot
@@ -11,7 +11,10 @@ use-project boost
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python ;
+  : requirements <library>/boost/python//boost_python 
+                 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 
+  ;

 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.
--- a/example/boost-build.jam
+++ b/example/boost-build.jam
--- a/example/quickstart/Jamroot
+++ b/example/quickstart/Jamroot
@@ -12,6 +12,8 @@ use-project boost
 # /boost/python.
 project boost-python-quickstart
  : requirements <library>/boost/python//boost_python 
+    		 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 	 
    ;

 # Make the definition of the python-extension rule available
--- a/example/tutorial/Jamroot
+++ b/example/tutorial/Jamroot
@@ -20,7 +20,10 @@ use-project boost
 # boost_python library from the project whose global ID is
 # /boost/python.
 project
-  : requirements <library>/boost/python//boost_python ;
+  : requirements <library>/boost/python//boost_python 
+                 <implicit-dependency>/boost//headers 
+  : usage-requirements <implicit-dependency>/boost//headers 
+  ;

 # Declare the three extension modules.  You can specify multiple
 # source files after the colon separated by spaces.
--- a/include/boost/python/arg_from_python.hpp
+++ b/include/boost/python/arg_from_python.hpp
--- a/include/boost/python/base_type_traits.hpp
+++ b/include/boost/python/base_type_traits.hpp
--- a/include/boost/python/borrowed.hpp
+++ b/include/boost/python/borrowed.hpp
--- a/include/boost/python/cast.hpp
+++ b/include/boost/python/cast.hpp
--- a/include/boost/python/converter/arg_from_python.hpp
+++ b/include/boost/python/converter/arg_from_python.hpp
--- a/include/boost/python/converter/arg_to_python.hpp
+++ b/include/boost/python/converter/arg_to_python.hpp
--- a/include/boost/python/converter/arg_to_python_base.hpp
+++ b/include/boost/python/converter/arg_to_python_base.hpp
--- a/include/boost/python/converter/context_result_converter.hpp
+++ b/include/boost/python/converter/context_result_converter.hpp
--- a/include/boost/python/converter/object_manager.hpp
+++ b/include/boost/python/converter/object_manager.hpp
--- a/include/boost/python/converter/pytype_function.hpp
+++ b/include/boost/python/converter/pytype_function.hpp
--- a/include/boost/python/converter/return_from_python.hpp
+++ b/include/boost/python/converter/return_from_python.hpp
--- a/include/boost/python/def_visitor.hpp
+++ b/include/boost/python/def_visitor.hpp
--- a/include/boost/python/detail/borrowed_ptr.hpp
+++ b/include/boost/python/detail/borrowed_ptr.hpp
--- a/include/boost/python/detail/convertible.hpp
+++ b/include/boost/python/detail/convertible.hpp
--- a/include/boost/python/detail/copy_ctor_mutates_rhs.hpp
+++ b/include/boost/python/detail/copy_ctor_mutates_rhs.hpp
--- a/include/boost/python/detail/def_helper_fwd.hpp
+++ b/include/boost/python/detail/def_helper_fwd.hpp
--- a/include/boost/python/detail/enable_if.hpp
+++ b/include/boost/python/detail/enable_if.hpp
--- a/include/boost/python/detail/force_instantiate.hpp
+++ b/include/boost/python/detail/force_instantiate.hpp
--- a/include/boost/python/detail/is_shared_ptr.hpp
+++ b/include/boost/python/detail/is_shared_ptr.hpp
--- a/include/boost/python/detail/is_wrapper.hpp
+++ b/include/boost/python/detail/is_wrapper.hpp
--- a/include/boost/python/detail/nullary_function_adaptor.hpp
+++ b/include/boost/python/detail/nullary_function_adaptor.hpp
--- a/include/boost/python/detail/prefix.hpp
+++ b/include/boost/python/detail/prefix.hpp
--- a/include/boost/python/detail/python_type.hpp
+++ b/include/boost/python/detail/python_type.hpp
--- a/include/boost/python/detail/sfinae.hpp
+++ b/include/boost/python/detail/sfinae.hpp
--- a/include/boost/python/detail/unwind_type.hpp
+++ b/include/boost/python/detail/unwind_type.hpp
--- a/include/boost/python/detail/unwrap_type_id.hpp
+++ b/include/boost/python/detail/unwrap_type_id.hpp
--- a/include/boost/python/detail/unwrap_wrapper.hpp
+++ b/include/boost/python/detail/unwrap_wrapper.hpp
--- a/include/boost/python/detail/value_arg.hpp
+++ b/include/boost/python/detail/value_arg.hpp
--- a/include/boost/python/detail/wrapper_base.hpp
+++ b/include/boost/python/detail/wrapper_base.hpp
--- a/include/boost/python/docstring_options.hpp
+++ b/include/boost/python/docstring_options.hpp
--- a/include/boost/python/handle.hpp
+++ b/include/boost/python/handle.hpp
--- a/include/boost/python/handle_fwd.hpp
+++ b/include/boost/python/handle_fwd.hpp
--- a/include/boost/python/object.hpp
+++ b/include/boost/python/object.hpp
--- a/include/boost/python/object/function_doc_signature.hpp
+++ b/include/boost/python/object/function_doc_signature.hpp
--- a/include/boost/python/object/inheritance_query.hpp
+++ b/include/boost/python/object/inheritance_query.hpp
--- a/include/boost/python/object/stl_iterator_core.hpp
+++ b/include/boost/python/object/stl_iterator_core.hpp
--- a/include/boost/python/object_items.hpp
+++ b/include/boost/python/object_items.hpp
--- a/include/boost/python/object_protocol_core.hpp
+++ b/include/boost/python/object_protocol_core.hpp
--- a/include/boost/python/other.hpp
+++ b/include/boost/python/other.hpp
--- a/include/boost/python/proxy.hpp
+++ b/include/boost/python/proxy.hpp
--- a/include/boost/python/pure_virtual.hpp
+++ b/include/boost/python/pure_virtual.hpp
--- a/include/boost/python/raw_function.hpp
+++ b/include/boost/python/raw_function.hpp
--- a/include/boost/python/refcount.hpp
+++ b/include/boost/python/refcount.hpp
--- a/include/boost/python/return_arg.hpp
+++ b/include/boost/python/return_arg.hpp
--- a/include/boost/python/self.hpp
+++ b/include/boost/python/self.hpp
--- a/include/boost/python/stl_iterator.hpp
+++ b/include/boost/python/stl_iterator.hpp
--- a/include/boost/python/wrapper.hpp
+++ b/include/boost/python/wrapper.hpp
--- a/src/wrapper.cpp
+++ b/src/wrapper.cpp
--- a/test/borrowed.cpp
+++ b/test/borrowed.cpp
--- a/test/cltree.cpp
+++ b/test/cltree.cpp
--- a/test/copy_ctor_mutates_rhs.cpp
+++ b/test/copy_ctor_mutates_rhs.cpp
--- a/test/crossmod_exception_a.cpp
+++ b/test/crossmod_exception_a.cpp
--- a/test/crossmod_exception_b.cpp
+++ b/test/crossmod_exception_b.cpp
--- a/test/injected.cpp
+++ b/test/injected.cpp
--- a/test/int_map_indexing_suite.cpp
+++ b/test/int_map_indexing_suite.cpp
--- a/test/keywords.cpp
+++ b/test/keywords.cpp
--- a/test/object_fail1.cpp
+++ b/test/object_fail1.cpp
--- a/test/object_manager.cpp
+++ b/test/object_manager.cpp
--- a/test/operators.cpp
+++ b/test/operators.cpp
--- a/test/polymorphism2.cpp
+++ b/test/polymorphism2.cpp
--- a/test/polymorphism2_auto_ptr.cpp
+++ b/test/polymorphism2_auto_ptr.cpp
--- a/test/properties.cpp
+++ b/test/properties.cpp
--- a/test/raw_ctor.cpp
+++ b/test/raw_ctor.cpp
--- a/test/raw_pyobject_fail1.cpp
+++ b/test/raw_pyobject_fail1.cpp
--- a/test/raw_pyobject_fail2.cpp
+++ b/test/raw_pyobject_fail2.cpp
--- a/test/result.cpp
+++ b/test/result.cpp
--- a/test/return_arg.cpp
+++ b/test/return_arg.cpp
--- a/test/stl_iterator.cpp
+++ b/test/stl_iterator.cpp
--- a/test/voidptr.cpp
+++ b/test/voidptr.cpp
--- a/test/wrapper_held_type.cpp
+++ b/test/wrapper_held_type.cpp
--- a/todo.html
+++ b/todo.html