1.35.0 Release Candidate 1

[SVN r43603]

build/VisualStudio/boost_python.dsp

@@ -0,0 +1,902 @@
+# Microsoft Developer Studio Project File - Name="boost_python" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=BOOST_PYTHON - WIN32 RELEASE
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "boost_python.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "boost_python.mak" CFG="BOOST_PYTHON - WIN32 RELEASE"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "boost_python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "boost_python - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "boost_python - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../bin-stage"
+# PROP Intermediate_Dir "release-obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x1409 /d "NDEBUG"
+# ADD RSC /l 0x1409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "boost_python - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../bin-stage"
+# PROP Intermediate_Dir "debug-obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /GZ /c
+# ADD CPP /nologo /MDd /W3 /GR /GX /Zi /Od /I "../../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /Zm800 /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x1409 /d "_DEBUG"
+# ADD RSC /l 0x1409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../bin-stage/boost_python_debug.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "boost_python - Win32 Release"
+# Name "boost_python - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\converter\arg_to_python_base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\converter\builtin_converters.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\class.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dict.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\enum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\errors.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\converter\from_python.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\function.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\inheritance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\iterator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\life_support.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\long.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\module.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\numeric.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object_operators.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object_protocol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\pickle_support.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\converter\registry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\slice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\object\stl_iterator.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\str.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tuple.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\converter\type_id.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\wrapper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\import.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\exec.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Group "detail"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\api_placeholder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\arg_tuple_size.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\borrowed_ptr.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\call_object.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\caller.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\char_array.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\config.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\construct.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\convertible.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\cv_category.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\decorated_type_id.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\def_helper.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\defaults_def.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\defaults_gen.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\dependent.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\destroy.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\exception_handler.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\force_instantiate.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\if_else.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\indirect_traits.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\make_keyword_range_fn.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\make_tuple.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\map_entry.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\member_function_cast.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\module_base.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\module_init.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\msvc_typeinfo.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\none.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\not_specified.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\operator_id.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\overloads_fwd.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\pointee.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\preprocessor.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\python22_fixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\raw_pyobject.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\referent_storage.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\result.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\returning.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\scope.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\string_literal.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\target.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\translate_exception.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\type_list.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\type_list_impl.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\type_list_impl_no_pts.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\type_list_utils.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\unwind_type.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\void_ptr.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\void_return.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\detail\wrap_python.hpp
+# End Source File
+# End Group
+# Begin Group "converter"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\arg_from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\arg_to_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\arg_to_python_base.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\builtin_converters.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\constructor_function.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\convertible_function.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\implicit.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\obj_mgr_arg_from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\object_manager.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\pointer_type_id.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\pyobject_traits.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\pyobject_type.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\pytype_arg_from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\pytype_object_mgr_traits.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\registered.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\registered_pointee.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\registrations.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\registry.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\return_from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\rvalue_from_python_data.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\converter\to_python_function_type.hpp
+# End Source File
+# End Group
+# Begin Group "object"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\add_to_namespace.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\class.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\class_converters.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\class_detail.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\class_wrapper.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\construct.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\enum_base.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\find_instance.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\forward.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\function.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\function_handle.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\function_object.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\inheritance.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\instance.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\iterator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\iterator_core.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\life_support.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\make_holder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\make_instance.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\pickle_support.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\pointer_holder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\py_function.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\select_holder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\stl_iterator_core.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\value_holder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object\value_holder_fwd.hpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\arg_from_python.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\args.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\args_fwd.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\back_reference.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\base_type_traits.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\bases.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\borrowed.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\call.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\call_method.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\cast.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\class.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\class_fwd.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\copy_const_reference.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\copy_non_const_reference.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\data_members.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\def.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\default_call_policies.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\dict.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\enum.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\errors.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\exception_translator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\extract.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\handle.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\handle_fwd.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\has_back_reference.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\implicit.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\init.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\instance_holder.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\iterator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\list.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\long.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\lvalue_from_pytype.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\make_function.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\manage_new_object.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\module.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\module_init.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\numeric.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_attributes.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_call.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_core.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_fwd.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_items.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_operators.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_protocol.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_protocol_core.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\object_slices.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\operators.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\operators2.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\other.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\overloads.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\pointee.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\proxy.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\ptr.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\refcount.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\reference_existing_object.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\return_internal_reference.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\return_value_policy.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\scope.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\self.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\signature.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\slice_nil.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\stl_iterator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\str.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\tag.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\to_python_converter.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\to_python_indirect.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\to_python_value.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\tuple.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\type_id.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\boost\python\with_custodian_and_ward.hpp
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

build/VisualStudio/boost_python.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "boost_python"=".\boost_python.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

doc/building.rst

@@ -11,7 +11,7 @@
    :alt: Boost C++ Libraries:
    :class: boost-logo
 
-__ ../index.html
+__ ../index.htm
 
 
 .. section-numbering::

doc/projects.html

@@ -375,27 +375,6 @@
       application modules, including GUI and post-processing of results.</p>
     </dd>
 
-    <dt><b><a href="http://polybori.sourceforge.net/">PolyBoRi</a></b></dt>
-
-    <dd>
-      <p><a href="mailto:brickenstein@mfo.de"
-        >Michael Brickenstein</a> writes:</p>
-
-      <blockquote>
-        <p>The core of PolyBoRi is a C++ library, which provides
-        high-level data types for Boolean polynomials and monomials,
-        exponent vectors, as well as for the underlying polynomial
-        rings and subsets of the powerset of the Boolean variables. As
-        a unique approach, binary decision diagrams are used as
-        internal storage type for polynomial structures. On top of
-        this C++-library we provide a Python interface. This allows
-        parsing of complex polynomial systems, as well as sophisticated
-        and extendable strategies for Gr&ouml;bner basis computation.
-        Boost.Python has helped us to create this interface in a
-        very clean way.</p>
-      </blockquote>
-    </dd>
-
     <dt><b><a href="http://www.rationaldiscovery.com">Rational Discovery
     LLC</a></b></dt>
 
@@ -456,11 +435,11 @@
   </dl>
   <hr>
 
-  <p>Revised
+  <p>Revised 
   <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-   29 May, 2008</p>
+   15 July, 2003</p>
 
   <p><i>&copy; Copyright <a href="http://www.boost.org/people/dave_abrahams.htm">Dave
-  Abrahams</a> 2002-2008.</i></p>
+  Abrahams</a> 2002-2003.</i></p>
 </body>
 </html>

doc/tutorial/doc/tutorial.qbk

@@ -186,10 +186,6 @@ And so on... Finally:
 Or something similar. If all is well, you should now have built the DLLs and
 run the Python program.
 
-[note Starting from Boost 1.35, bjam erases the generated executables
-(e.g. pyd file) after the test has concluded to conserve disk space.
-To keep bjam from doing that, pass --preserve-test-targets to bjam.]
-
 [:[*There you go... Have fun!]]
 
 [endsect]
@@ -1385,9 +1381,9 @@ 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 [@../../../v2/handle.html handle] and

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>

doc/v2/Dereferenceable.html

@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Dereferenceable Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">

doc/v2/Extractor.html

@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Extractor Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">

doc/v2/HolderGenerator.html

@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../../boost.css">
+<link rel="stylesheet" type="text/css" href=../../../../boost.css>
 <title>Boost.Python - Holder Concept</title>
 </head>
 <body link="#0000ff" vlink="#800080">

doc/v2/object.html

@@ -74,32 +74,6 @@
             </dl>
           </dd>
 
-          <dt><a href="#const_objattribute_policies-spec">Class
-          <code>const_objattribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#const_objattribute_policies-spec-synopsis">Class
-              <code>const_objattribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#const_objattribute_policies-spec-statics">Class
-              <code>const_objattribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#objattribute_policies-spec">Class
-          <code>objattribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#objattribute_policies-spec-synopsis">Class
-              <code>objattribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#objattribute_policies-spec-statics">Class
-              <code>objattribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
           <dt><a href="#const_item_policies-spec">Class
           <code>const_item_policies</code></a></dt>
 
@@ -354,102 +328,6 @@ static void del(object const&amp;target, char const* key);
     <!-- end -->
     <!-- begin -->
 
-    <h3><a name="const_objattribute_policies-spec"></a>Class
-    <code>const_objattribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a <code>const&nbsp;object</code> when the attribute name is
-    given as a <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="const_objattribute_policies-spec-synopsis"></a>Class
-    <code>const_objattribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct const_objattribute_policies
-  {
-      typedef object const& key_type;
-      static object get(object const&amp; target, object const& key);
-  };
-}}}
-</pre>
-
-    <h4><a name="const_objattribute_policies-spec-statics"></a>Class
-    <code>const_objattribute_policies</code> static functions</h4>
-<pre>
-static object get(object const&amp; target, object const& key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> accesses the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> An <code>object</code> managing the result of the
-      attribute access.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-
-    <h3><a name="objattribute_policies-spec"></a>Class
-    <code>objattribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a mutable <code>object</code> when the attribute name is
-    given as a <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="objattribute_policies-spec-synopsis"></a>Class
-    <code>objattribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct objattribute_policies : const_objattribute_policies
-  {
-      static object const&amp; set(object const&amp; target, object const& key, object const&amp; value);
-      static void del(object const&amp;target, object const& key);
-  };
-}}}
-</pre>
-
-    <h4><a name="objattribute_policies-spec-statics"></a>Class
-    <code>objattribute_policies</code> static functions</h4>
-<pre>
-static object const&amp; set(object const&amp; target, object const& key, object const&amp; value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> sets the attribute of <code>target</code> named by
-      <code>key</code> to <code>value</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-<pre>
-static void del(object const&amp;target, object const& key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <code>object</code>
-      holding a string.</dt>
-
-      <dt><b>Effects:</b> deletes the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-    <!-- end -->
-    <!-- begin -->
-
     <h3><a name="const_item_policies-spec"></a>Class
     <code>const_item_policies</code></h3>
 
@@ -655,11 +533,6 @@ namespace boost { namespace python { namespace api
       template &lt;class A0, class A1,...class An&gt;
       object operator()(A0 const&amp;, A1 const&amp;,...An const&amp;) const;
 
-      detail::args_proxy operator* () const; 
-      object operator()(detail::args_proxy const &amp;args) const; 
-      object operator()(detail::args_proxy const &amp;args, 
-                        detail::kwds_proxy const &amp;kwds) const; 
-
       // truth value testing
       //
       typedef unspecified bool_type;
@@ -669,8 +542,6 @@ namespace boost { namespace python { namespace api
       //
       proxy&lt;const_object_attribute&gt; attr(char const*) const;
       proxy&lt;object_attribute&gt; attr(char const*);
-      proxy&lt;const_object_objattribute&gt; attr(object const&) const;
-      proxy&lt;object_objattribute&gt; attr(object const&);
 
       // item access
       //
@@ -709,25 +580,6 @@ object operator()(A0 const&amp; a1, A1 const&amp; a2,...An const&amp; aN) const;
       call&lt;object&gt;(object(*static_cast&lt;U*&gt;(this)).ptr(), a1,
       a2,...aN)</dt>
     </dl>
-
-<pre>
-object operator()(detail::args_proxy const &amp;args) const; 
-</pre>
-<dl class="function-semantics">
-  <dt><b>Effects:</b>
-  call object with arguments given by the tuple <varname>args</varname></dt>
-</dl>
-<pre>
-object operator()(detail::args_proxy const &amp;args, 
-                  detail::kwds_proxy const &amp;kwds) const; 
-</pre>
-<dl class="function-semantics">
-  <dt><b>Effects:</b>
-  call object with arguments given by the tuple <varname>args</varname>, and named
-  arguments given by the dictionary <varname>kwds</varname></dt>
-</dl>
-
-
 <pre>
 operator bool_type() const;
 </pre>
@@ -756,21 +608,6 @@ proxy&lt;object_attribute&gt; attr(char const* name);
       <code>name</code> as its key.</dt>
     </dl>
 <pre>
-proxy&lt;const_object_objattribute&gt; attr(const object& name) const;
-proxy&lt;object_objattribute&gt; attr(const object& name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> name is a <code>object</code> holding a string.</dt>
-
-      <dt><b>Effects:</b> accesses the named attribute of
-      <code>*this</code>.</dt>
-
-      <dt><b>Returns:</b> a proxy object which binds
-      <code>object(*static_cast&lt;U*&gt;(this))</code> as its target, and
-      <code>name</code> as its key.</dt>
-    </dl>
-<pre>
 template &lt;class T&gt;
 proxy&lt;const_object_item&gt; operator[](T const&amp; key) const;
 template &lt;class T&gt;
@@ -1101,11 +938,11 @@ object sum_items(object seq)
 </pre>
     <p>Revised 
     <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  27 May, 2008
+  13 January, 2006
   <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
     </p>
 
     <p><i>&copy; Copyright <a href=
-    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2008.</i></p>
+    "http://www.boost.org/people/dave_abrahams.htm">Dave Abrahams</a> 2006.</i></p>
   </body>
 </html>

doc/v2/pickle.html

@@ -1,93 +1,112 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"
+"http://www.w3.org/TR/REC-html40/strict.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Boost.Python Pickle Support</title>
-</head>
+<title>Boost.Python Pickle Support</title>
 
-<body>
-  <div>
-    <img src="../../../../boost.png" alt="boost.png (6897 bytes)" align=
-    "center" width="277" height="86" />
-    <hr />
+<div>
 
-    <h1>Boost.Python Pickle Support</h1>Pickle is a Python module for object
-    serialization, also known as persistence, marshalling, or flattening.
+<img src="../../../../boost.png"
+     alt="boost.png (6897 bytes)"
+     align="center"
+     width="277" height="86">
 
-    <p>It is often necessary to save and restore the contents of an object to
-    a file. One approach to this problem is to write a pair of functions that
-    read and write data from a file in a special format. A powerful
-    alternative approach is to use Python's pickle module. Exploiting
-    Python's ability for introspection, the pickle module recursively
-    converts nearly arbitrary Python objects into a stream of bytes that can
-    be written to a file.</p>
+<hr>
+<h1>Boost.Python Pickle Support</h1>
 
-    <p>The Boost Python Library supports the pickle module through the
-    interface as described in detail in the <a href=
-    "http://www.python.org/doc/current/lib/module-pickle.html">Python Library
-    Reference for pickle.</a> This interface involves the special methods
-    <tt>__getinitargs__</tt>, <tt>__getstate__</tt> and <tt>__setstate__</tt>
-    as described in the following. Note that Boost.Python is also fully
-    compatible with Python's cPickle module.</p>
-    <hr />
+Pickle is a Python module for object serialization, also known
+as persistence, marshalling, or flattening.
 
-    <h2>The Boost.Python Pickle Interface</h2>At the user level, the
-    Boost.Python pickle interface involves three special methods:
+<p>
+It is often necessary to save and restore the contents of an object to
+a file. One approach to this problem is to write a pair of functions
+that read and write data from a file in a special format. A powerful
+alternative approach is to use Python's pickle module. Exploiting
+Python's ability for introspection, the pickle module recursively
+converts nearly arbitrary Python objects into a stream of bytes that
+can be written to a file.
 
-    <dl>
-      <dt><strong><tt>__getinitargs__</tt></strong></dt>
+<p>
+The Boost Python Library supports the pickle module
+through the interface as described in detail in the
+<a href="http://www.python.org/doc/current/lib/module-pickle.html"
+>Python Library Reference for pickle.</a> This interface
+involves the special methods <tt>__getinitargs__</tt>,
+<tt>__getstate__</tt> and <tt>__setstate__</tt> as described
+in the following. Note that Boost.Python is also fully compatible
+with Python's cPickle module.
 
-      <dd>
-        When an instance of a Boost.Python extension class is pickled, the
-        pickler tests if the instance has a <tt>__getinitargs__</tt> method.
-        This method must return a Python tuple (it is most convenient to use
-        a boost::python::tuple). When the instance is restored by the
-        unpickler, the contents of this tuple are used as the arguments for
-        the class constructor.
+<hr>
+<h2>The Boost.Python Pickle Interface</h2>
 
-        <p>If <tt>__getinitargs__</tt> is not defined, <tt>pickle.load</tt>
-        will call the constructor (<tt>__init__</tt>) without arguments;
-        i.e., the object must be default-constructible.</p>
-      </dd>
+At the user level, the Boost.Python pickle interface involves three special
+methods:
 
-      <dt><strong><tt>__getstate__</tt></strong></dt>
+<dl>
+<dt>
+<strong><tt>__getinitargs__</tt></strong>
+<dd>
+  When an instance of a Boost.Python extension class is pickled, the
+  pickler tests if the instance has a <tt>__getinitargs__</tt> method.
+  This method must return a Python tuple (it is most convenient to use
+  a boost::python::tuple). When the instance is restored by the
+  unpickler, the contents of this tuple are used as the arguments for
+  the class constructor.
 
-      <dd>When an instance of a Boost.Python extension class is pickled, the
-      pickler tests if the instance has a <tt>__getstate__</tt> method. This
-      method should return a Python object representing the state of the
-      instance.</dd>
+  <p>
+  If <tt>__getinitargs__</tt> is not defined, <tt>pickle.load</tt>
+  will call the constructor (<tt>__init__</tt>) without arguments;
+  i.e., the object must be default-constructible.
 
-      <dt><strong><tt>__setstate__</tt></strong></dt>
+<p>
+<dt>
+<strong><tt>__getstate__</tt></strong>
 
-      <dd>When an instance of a Boost.Python extension class is restored by
-      the unpickler (<tt>pickle.load</tt>), it is first constructed using the
-      result of <tt>__getinitargs__</tt> as arguments (see above).
-      Subsequently the unpickler tests if the new instance has a
-      <tt>__setstate__</tt> method. If so, this method is called with the
-      result of <tt>__getstate__</tt> (a Python object) as the argument.</dd>
-    </dl>The three special methods described above may be <tt>.def()</tt>'ed
-    individually by the user. However, Boost.Python provides an easy to use
-    high-level interface via the
-    <strong><tt>boost::python::pickle_suite</tt></strong> class that also
-    enforces consistency: <tt>__getstate__</tt> and <tt>__setstate__</tt>
-    must be defined as pairs. Use of this interface is demonstrated by the
-    following examples.
-    <hr />
+<dd>
+  When an instance of a Boost.Python extension class is pickled, the
+  pickler tests if the instance has a <tt>__getstate__</tt> method.
+  This method should return a Python object representing the state of
+  the instance.
 
-    <h2>Examples</h2>There are three files in <tt>boost/libs/python/test</tt>
-    that show how to provide pickle support.
-    <hr />
+<p>
+<dt>
+<strong><tt>__setstate__</tt></strong>
 
-    <h3><a href="../../test/pickle1.cpp"><tt>pickle1.cpp</tt></a></h3>The C++
-    class in this example can be fully restored by passing the appropriate
-    argument to the constructor. Therefore it is sufficient to define the
-    pickle interface method <tt>__getinitargs__</tt>. This is done in the
-    following way:
+<dd>
+  When an instance of a Boost.Python extension class is restored by the
+  unpickler (<tt>pickle.load</tt>), it is first constructed using the
+  result of <tt>__getinitargs__</tt> as arguments (see above). Subsequently
+  the unpickler tests if the new instance has a <tt>__setstate__</tt>
+  method. If so, this method is called with the result of
+  <tt>__getstate__</tt> (a Python object) as the argument.
 
-    <ul>
-      <li>1. Definition of the C++ pickle function:
-        <pre>
+</dl>
+
+The three special methods described above may be <tt>.def()</tt>'ed
+individually by the user. However, Boost.Python provides an easy to use
+high-level interface via the
+<strong><tt>boost::python::pickle_suite</tt></strong> class that also
+enforces consistency: <tt>__getstate__</tt> and <tt>__setstate__</tt>
+must be defined as pairs. Use of this interface is demonstrated by the
+following examples.
+
+<hr>
+<h2>Examples</h2>
+
+There are three files in 
+<tt>boost/libs/python/test</tt> that show how to
+provide pickle support.
+
+<hr>
+<h3><a href="../../test/pickle1.cpp"><tt>pickle1.cpp</tt></a></h3>
+
+    The C++ class in this example can be fully restored by passing the
+    appropriate argument to the constructor. Therefore it is sufficient
+    to define the pickle interface method <tt>__getinitargs__</tt>.
+    This is done in the following way:
+
+<ul>
+<li>1. Definition of the C++ pickle function:
+<pre>
   struct world_pickle_suite : boost::python::pickle_suite
   {
     static
@@ -98,28 +117,26 @@
     }
   };
 </pre>
-      </li>
-
-      <li>2. Establishing the Python binding:
-        <pre>
+<li>2. Establishing the Python binding:
+<pre>
   class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
       // ...
       .def_pickle(world_pickle_suite())
       // ...
 </pre>
-      </li>
-    </ul>
-    <hr />
+</ul>
 
-    <h3><a href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a></h3>The C++
-    class in this example contains member data that cannot be restored by any
-    of the constructors. Therefore it is necessary to provide the
-    <tt>__getstate__</tt>/<tt>__setstate__</tt> pair of pickle interface
-    methods:
+<hr>
+<h3><a href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a></h3>
 
-    <ul>
-      <li>1. Definition of the C++ pickle functions:
-        <pre>
+    The C++ class in this example contains member data that cannot be
+    restored by any of the constructors. Therefore it is necessary to
+    provide the <tt>__getstate__</tt>/<tt>__setstate__</tt> pair of
+    pickle interface methods:
+
+<ul>
+<li>1. Definition of the C++ pickle functions:
+<pre>
   struct world_pickle_suite : boost::python::pickle_suite
   {
     static
@@ -144,76 +161,92 @@
     }
   };
 </pre>
-      </li>
-
-      <li>2. Establishing the Python bindings for the entire suite:
-        <pre>
+<li>2. Establishing the Python bindings for the entire suite:
+<pre>
   class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
       // ...
       .def_pickle(world_pickle_suite())
       // ...
 </pre>
-      </li>
-    </ul>
+</ul>
 
-    <p>For simplicity, the <tt>__dict__</tt> is not included in the result of
-    <tt>__getstate__</tt>. This is not generally recommended, but a valid
-    approach if it is anticipated that the object's <tt>__dict__</tt> will
-    always be empty. Note that the safety guard described below will catch
-    the cases where this assumption is violated.</p>
-    <hr />
+    <p>
+    For simplicity, the <tt>__dict__</tt> is not included in the result
+    of <tt>__getstate__</tt>. This is not generally recommended, but a
+    valid approach if it is anticipated that the object's
+    <tt>__dict__</tt> will always be empty. Note that the safety guard
+    described below will catch the cases where this assumption is violated.
 
-    <h3><a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a></h3>This
-    example is similar to <a href=
-    "../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a>. However, the object's
-    <tt>__dict__</tt> is included in the result of <tt>__getstate__</tt>.
-    This requires a little more code but is unavoidable if the object's
-    <tt>__dict__</tt> is not always empty.
-    <hr />
+<hr>
+<h3><a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a></h3>
 
-    <h2>Pitfall and Safety Guard</h2>The pickle protocol described above has
-    an important pitfall that the end user of a Boost.Python extension module
-    might not be aware of:
+    This example is similar to <a
+    href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a>. However, the
+    object's <tt>__dict__</tt> is included in the result of
+    <tt>__getstate__</tt>.  This requires a little more code but is
+    unavoidable if the object's <tt>__dict__</tt> is not always empty.
 
-    <p><strong><tt>__getstate__</tt> is defined and the instance's
-    <tt>__dict__</tt> is not empty.</strong></p>
+<hr>
+<h2>Pitfall and Safety Guard</h2>
 
-    <p>The author of a Boost.Python extension class might provide a
-    <tt>__getstate__</tt> method without considering the possibilities
-    that:</p>
+The pickle protocol described above has an important pitfall that the
+end user of a Boost.Python extension module might not be aware of:
+<p>
+<strong>
+<tt>__getstate__</tt> is defined and the instance's <tt>__dict__</tt>
+is not empty.
+</strong>
+<p>
 
-    <ul>
-      <li>his class is used in Python as a base class. Most likely the
-      <tt>__dict__</tt> of instances of the derived class needs to be pickled
-      in order to restore the instances correctly.</li>
+  The author of a Boost.Python extension class might provide a
+  <tt>__getstate__</tt> method without considering the possibilities
+  that:
 
-      <li>the user adds items to the instance's <tt>__dict__</tt> directly.
-      Again, the <tt>__dict__</tt> of the instance then needs to be
-      pickled.</li>
-    </ul>
+  <p>
+  <ul>
+  <li>
+    his class is used in Python as a base class. Most likely the
+    <tt>__dict__</tt> of instances of the derived class needs to be
+    pickled in order to restore the instances correctly.
 
-    <p>To alert the user to this highly unobvious problem, a safety guard is
-    provided. If <tt>__getstate__</tt> is defined and the instance's
-    <tt>__dict__</tt> is not empty, Boost.Python tests if the class has an
-    attribute <tt>__getstate_manages_dict__</tt>. An exception is raised if
-    this attribute is not defined:</p>
-    <pre>
+  <p>
+  <li>
+    the user adds items to the instance's <tt>__dict__</tt> directly.
+    Again, the <tt>__dict__</tt> of the instance then needs to be
+    pickled.
+
+  </ul>
+  <p>
+
+  To alert the user to this highly unobvious problem, a safety guard is
+  provided. If <tt>__getstate__</tt> is defined and the instance's
+  <tt>__dict__</tt> is not empty, Boost.Python tests if the class has
+  an attribute <tt>__getstate_manages_dict__</tt>. An exception is
+  raised if this attribute is not defined:
+
+<pre>
     RuntimeError: Incomplete pickle support (__getstate_manages_dict__ not set)
-</pre>To resolve this problem, it should first be established that the <tt>
-    __getstate__</tt> and <tt>__setstate__</tt> methods manage the
-    instances's <tt>__dict__</tt> correctly. Note that this can be done
-    either at the C++ or the Python level. Finally, the safety guard should
-    intentionally be overridden. E.g. in C++ (from <a href=
-    "../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a>):
-    <pre>
+</pre>
+
+  To resolve this problem, it should first be established that the
+  <tt>__getstate__</tt> and <tt>__setstate__</tt> methods manage the
+  instances's <tt>__dict__</tt> correctly. Note that this can be done
+  either at the C++ or the Python level. Finally, the safety guard
+  should intentionally be overridden. E.g. in C++ (from
+  <a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a>):
+
+<pre>
   struct world_pickle_suite : boost::python::pickle_suite
   {
     // ...
 
     static bool getstate_manages_dict() { return true; }
   };
-</pre>Alternatively in Python:
-    <pre>
+</pre>
+
+  Alternatively in Python:
+
+<pre>
     import your_bpl_module
     class your_class(your_bpl_module.your_class):
       __getstate_manages_dict__ = 1
@@ -222,41 +255,54 @@
       def __setstate__(self, state):
         # your code here
 </pre>
-    <hr />
 
-    <h2>Practical Advice</h2>
+<hr>
+<h2>Practical Advice</h2>
 
-    <ul>
-      <li>In Boost.Python extension modules with many extension classes,
-      providing complete pickle support for all classes would be a
-      significant overhead. In general complete pickle support should only be
-      implemented for extension classes that will eventually be pickled.</li>
+<ul>
+<li>
+  In Boost.Python extension modules with many extension classes,
+  providing complete pickle support for all classes would be a
+  significant overhead. In general complete pickle support should
+  only be implemented for extension classes that will eventually
+  be pickled.
 
-      <li>Avoid using <tt>__getstate__</tt> if the instance can also be
-      reconstructed by way of <tt>__getinitargs__</tt>. This automatically
-      avoids the pitfall described above.</li>
+<p>
+<li>
+  Avoid using <tt>__getstate__</tt> if the instance can also be
+  reconstructed by way of <tt>__getinitargs__</tt>. This automatically
+  avoids the pitfall described above.
 
-      <li>If <tt>__getstate__</tt> is required, include the instance's
-      <tt>__dict__</tt> in the Python object that is returned.</li>
-    </ul>
-    <hr />
+<p>
+<li>
+  If <tt>__getstate__</tt> is required, include the instance's
+  <tt>__dict__</tt> in the Python object that is returned.
 
-    <h2>Light-weight alternative: pickle support implemented in Python</h2>
+</ul>
 
-    <h3><a href="../../test/pickle4.cpp"><tt>pickle4.cpp</tt></a></h3>The
-    <tt>pickle4.cpp</tt> example demonstrates an alternative technique for
-    implementing pickle support. First we direct Boost.Python via the
-    <tt>class_::enable_pickling()</tt> member function to define only the
-    basic attributes required for pickling:
-    <pre>
+<hr>
+<h2>Light-weight alternative: pickle support implemented in Python</h2>
+
+<h3><a href="../../test/pickle4.cpp"><tt>pickle4.cpp</tt></a></h3>
+
+The <tt>pickle4.cpp</tt> example demonstrates an alternative technique
+for implementing pickle support. First we direct Boost.Python via
+the <tt>class_::enable_pickling()</tt> member function to define only
+the basic attributes required for pickling:
+
+<pre>
   class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
       // ...
       .enable_pickling()
       // ...
-</pre>This enables the standard Python pickle interface as described in the
-Python documentation. By "injecting" a <tt>__getinitargs__</tt> method into
-the definition of the wrapped class we make all instances pickleable:
-    <pre>
+</pre>
+
+This enables the standard Python pickle interface as described
+in the Python documentation. By &quot;injecting&quot; a
+<tt>__getinitargs__</tt> method into the definition of the wrapped
+class we make all instances pickleable:
+
+<pre>
   # import the wrapped world class
   from pickle4_ext import world
 
@@ -266,15 +312,18 @@ the definition of the wrapped class we make all instances pickleable:
 
   # now inject __getinitargs__ (Python is a dynamic language!)
   world.__getinitargs__ = world_getinitargs
-</pre>See also the <a href=
-"../tutorial/doc/html/python/techniques.html#python.extending_wrapped_objects_in_python">
-    tutorial section</a> on injecting additional methods from Python.
-    <hr />
-    © Copyright Ralf W. Grosse-Kunstleve 2001-2004. 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)
+</pre>
 
-    <p>Updated: Feb 2004.</p>
-  </div>
-</body>
-</html>
+See also the
+<a href="../tutorial/doc/html/python/techniques.html#python.extending_wrapped_objects_in_python"
+>tutorial section</a> on injecting additional methods from Python.
+
+<hr>
+
+&copy; Copyright Ralf W. Grosse-Kunstleve 2001-2004. 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)
+
+<p>
+Updated: Feb 2004.
+</div>

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>

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

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>
 

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_*) 

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;
     

include/boost/python/object_attributes.hpp

@@ -17,7 +17,6 @@ struct const_attribute_policies
 {
     typedef char const* key_type;
     static object get(object const& target, char const* key);
-    static object get(object const& target, object const& key);
 };
   
 struct attribute_policies : const_attribute_policies
@@ -26,18 +25,6 @@ struct attribute_policies : const_attribute_policies
     static void del(object const&target, char const* key);
 };
 
-struct const_objattribute_policies
-{
-    typedef object const key_type;
-    static object get(object const& target, object const& key);
-};
-  
-struct objattribute_policies : const_objattribute_policies
-{
-    static object const& set(object const& target, object const& key, object const& value);
-    static void del(object const&target, object const& key);
-};
-
 //
 // implementation
 //
@@ -55,30 +42,11 @@ inline const_object_attribute object_operators<U>::attr(char const* name) const
     return const_object_attribute(x, name);
 }
 
-template <class U>
-inline object_objattribute object_operators<U>::attr(object const& name)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_objattribute(x, name);
-}
-
-template <class U>
-inline const_object_objattribute object_operators<U>::attr(object const& name) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_objattribute(x, name);
-}
-
 inline object const_attribute_policies::get(object const& target, char const* key)
 {
     return python::getattr(target, key);
 }
 
-inline object const_objattribute_policies::get(object const& target, object const& key)
-{
-    return python::getattr(target, key);
-}
-
 inline object const& attribute_policies::set(
     object const& target
     , char const* key
@@ -88,15 +56,6 @@ inline object const& attribute_policies::set(
     return value;
 }
 
-inline object const& objattribute_policies::set(
-    object const& target
-    , object const& key
-    , object const& value)
-{
-    python::setattr(target, key, value);
-    return value;
-}
-
 inline void attribute_policies::del(
     object const& target
     , char const* key)
@@ -104,13 +63,6 @@ inline void attribute_policies::del(
     python::delattr(target, key);
 }
 
-inline void objattribute_policies::del(
-    object const& target
-    , object const& key)
-{
-    python::delattr(target, key);
-}
-
 }}} // namespace boost::python::api
 
 #endif // OBJECT_ATTRIBUTES_DWA2002615_HPP

include/boost/python/object_core.hpp

@@ -42,12 +42,6 @@
 
 namespace boost { namespace python { 
 
-namespace detail
-{
-  class kwds_proxy; 
-  class args_proxy; 
-} 
-
 namespace converter
 {
   template <class T> struct arg_to_python;
@@ -65,8 +59,6 @@ namespace api
   
   struct const_attribute_policies;
   struct attribute_policies;
-  struct const_objattribute_policies;
-  struct objattribute_policies;
   struct const_item_policies;
   struct item_policies;
   struct const_slice_policies;
@@ -75,8 +67,6 @@ namespace api
 
   typedef proxy<const_attribute_policies> const_object_attribute;
   typedef proxy<attribute_policies> object_attribute;
-  typedef proxy<const_objattribute_policies> const_object_objattribute;
-  typedef proxy<objattribute_policies> object_objattribute;
   typedef proxy<const_item_policies> const_object_item;
   typedef proxy<item_policies> object_item;
   typedef proxy<const_slice_policies> const_object_slice;
@@ -108,11 +98,6 @@ namespace api
 
 # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
 # include BOOST_PP_ITERATE()
-    
-      detail::args_proxy operator* () const; 
-      object operator()(detail::args_proxy const &args) const; 
-      object operator()(detail::args_proxy const &args, 
-                        detail::kwds_proxy const &kwds) const; 
 
       // truth value testing
       //
@@ -123,8 +108,6 @@ namespace api
       //
       const_object_attribute attr(char const*) const;
       object_attribute attr(char const*);
-      const_object_objattribute attr(object const&) const;
-      object_objattribute attr(object const&);
 
       // item access
       //
@@ -230,11 +213,11 @@ namespace api
       inline object_base(object_base const&);
       inline object_base(PyObject* ptr);
       
-      inline object_base& operator=(object_base const& rhs);
-      inline ~object_base();
+      object_base& operator=(object_base const& rhs);
+      ~object_base();
         
       // Underlying object access -- returns a borrowed reference
-      inline PyObject* ptr() const;
+      PyObject* ptr() const;
       
    private:
       PyObject* m_ptr;
@@ -404,7 +387,7 @@ namespace api
       static PyObject*
       get(T const& x, U)
       {
-          return python::incref(get_managed_object(x, boost::python::tag));
+          return python::incref(get_managed_object(x, tag));
       }
   };
 
@@ -427,62 +410,6 @@ template <class T> struct extract;
 // implementation
 //
 
-namespace detail 
-{
-
-class call_proxy 
-{ 
-public: 
-  call_proxy(object target) : m_target(target) {} 
-  operator object() const { return m_target;} 
- 
- private: 
-    object m_target; 
-}; 
- 
-class kwds_proxy : public call_proxy 
-{ 
-public: 
-  kwds_proxy(object o = object()) : call_proxy(o) {} 
-}; 
-class args_proxy : public call_proxy 
-{ 
-public: 
-  args_proxy(object o) : call_proxy(o) {} 
-  kwds_proxy operator* () const { return kwds_proxy(*this);} 
-}; 
-} 
- 
-template <typename U> 
-detail::args_proxy api::object_operators<U>::operator* () const 
-{ 
-  object_cref2 x = *static_cast<U const*>(this); 
-  return boost::python::detail::args_proxy(x); 
-} 
- 
-template <typename U> 
-object api::object_operators<U>::operator()(detail::args_proxy const &args) const 
-{ 
-  U const& self = *static_cast<U const*>(this); 
-  PyObject *result = PyObject_Call(get_managed_object(self, boost::python::tag), 
-                                   args.operator object().ptr(), 
-                                   0); 
-  return object(boost::python::detail::new_reference(result)); 
- 
-} 
- 
-template <typename U> 
-object api::object_operators<U>::operator()(detail::args_proxy const &args, 
-                                            detail::kwds_proxy const &kwds) const 
-{ 
-  U const& self = *static_cast<U const*>(this); 
-  PyObject *result = PyObject_Call(get_managed_object(self, boost::python::tag), 
-                                   args.operator object().ptr(), 
-                                   kwds.operator object().ptr()); 
-  return object(boost::python::detail::new_reference(result)); 
- 
-}  
-
 inline object::object()
     : object_base(python::incref(Py_None))
 {}

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));
 }

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>

include/boost/python/ptr.hpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 // Based on boost/ref.hpp, thus:
-//  Copyright (C) 1999, 2000 Jaakko Jarvi (jaakko.jarvi@cs.utu.fi)
+//  Copyright (C) 1999, 2000 Jaakko Järvi (jaakko.jarvi@cs.utu.fi)
 //  Copyright (C) 2001 Peter Dimov
 
 # if _MSC_VER+0 >= 1020

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())