Merge branch 'develop'

This reverts commit b49a186b6f.

.appveyor.yml

@@ -4,7 +4,7 @@ environment:
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
-    BOOST_PREFIX: C:\Libraries\boost_1_60_0
+    BOOST_PREFIX: C:\Libraries\boost_1_63_0
 
   matrix:
 
@@ -15,7 +15,8 @@ environment:
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: "2.7.x" # currently 2.7.9
       PYTHON_ARCH: "32"
-      ARCH: "x86"
+      MSVC: "14.0"
+      ARCH: x86
 
     #- PYTHON: "C:\\Python27-x64"
     #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
@@ -26,9 +27,11 @@ environment:
     #  PYTHON_VERSION: "3.5.x" # currently 3.4.3
     #  PYTHON_ARCH: "32"
 
-    #- PYTHON: "C:\\Python35-x64"
-    #  PYTHON_VERSION: "3.5.x" # currently 3.4.3
-    #  PYTHON_ARCH: "64"
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "64"
+      MSVC: "12.0"
+      ARCH: x86_64
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -68,19 +71,22 @@ install:
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  - easy_install scons
-  #- "%CMD_IN_ENV% pip install -r dev-requirements.txt"
+  - |
+     curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+     tar xf faber.tar.gz
+     CD faber-release-0.2
+     python setup.py install
+     CD ..
+  # report the available MSVC compilers
+  - python -m faber.tools.msvc
+  - easy_install sphinx
+  - pip install numpy
 
 build_script:
-  # Build the compiled extension
-  #- "%CMD_IN_ENV% python setup.py build"
-  - scons config arch=%ARCH% --boost-include=%BOOST_PREFIX%
-  - scons arch=%ARCH%
+  - faber --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% msvc.version=%MSVC%
 
 test_script:
-  # Run the project tests
-  #- "%CMD_IN_ENV% python setup.py nosetests"
-  - scons test arch=%ARCH% --verbose
+  - faber --with-boost-include=%BOOST_PREFIX% test.report target.arch=%ARCH% msvc.version=%MSVC%
 
 after_test:
   # If tests are successful, create binary packages for the project.
@@ -95,4 +101,4 @@ after_test:
 
 #on_success:
 #  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
+#

.ci/faber

@@ -0,0 +1,3 @@
+from faber.tools.python import python
+
+p = python(command='$PYTHON')

.travis.yml

@@ -26,12 +26,10 @@ matrix:
     - compiler: gcc
       env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
     - compiler: clang
-      # clang generates an 'illegal instruction' error in the NumPy check.
-      # Perhaps we need to upgrade clang to a newer version ?
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98 OPTIONS=--no-numpy
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
     - compiler: clang
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11 OPTIONS=--no-numpy
-    - env: PYTHON=python DOC=1
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
+    #- env: PYTHON=python DOC=1
 
 
 addons:
@@ -77,16 +75,28 @@ install:
        ./bootstrap.sh
        ./b2 tools/bcp
        mkdir -p $HOME/Boost
+       # Install Boost.Python prerequisites, but not Boost.Python itself.
        dist/bin/bcp python tools/boostbook tools/quickbook $HOME/Boost &> /dev/null
+       rm -rf $HOME/Boost/boost/python*
+       popd
+       # Install Faber, the build tool.
+       date=2017-11-09
+       #wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
+       wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+       tar xf 0.2.tar.gz
+       pushd faber-release-0.2
+       sudo python setup.py install
        popd
      fi
 
 before_script:
-- scons --version
+- sed -e "s/\$PYTHON/$PYTHON/g" .ci/faber > ~/.faber
+- $PYTHON --version
+- faber -h
 
 script:
-- scons config --python=$PYTHON --boost-include=$HOME/Boost $OPTIONS
-- if [ "$DOC" ]; then scons doc; else scons && scons test; fi
+- faber --with-boost-include=$HOME/Boost test.report cxx.name=$CXX cxxflags=$CXXFLAGS
+#- if [ "$DOC" ]; then scons doc; else scons && scons test; fi
 
 after_success:
 # Upload docs only when building upstream.

SConstruct

@@ -39,6 +39,7 @@ arch = ARGUMENTS.get('arch', platform.machine())
 env_vars = {}
 if 'CXX' in os.environ: env_vars['CXX'] = os.environ['CXX']
 if 'CXXFLAGS' in os.environ: env_vars['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
+env_vars['ENV'] = os.environ #{'PATH': os.environ['PATH'], 'TMP' : os.environ['TMP']}
 env = Environment(toolpath=['config/tools'],
                   tools=['default', 'libs', 'tests', 'doc', 'sphinx4scons'],
                   variables=vars,
@@ -84,7 +85,7 @@ if not GetOption('verbose'):
     config.ui.pretty_output(env)    
 
 # build
-env['BPL_VERSION'] = '1.62'
+env['BPL_VERSION'] = '1.65'
 for e in config.variants(env):
     variant_dir=e.subst("$BOOST_CURRENT_VARIANT_DIR")
     e.SConscript('src/SConscript', variant_dir=variant_dir + '/src',

build/Jamfile

@@ -52,7 +52,6 @@ rule lib_boost_python ( version )
 {
     lib $(lib_boost_python($(version)))
         : # sources
-        numeric.cpp
         list.cpp
         long.cpp
         dict.cpp
@@ -124,8 +123,8 @@ rule lib_boost_python ( version )
 lib_boost_numpy(2) = boost_numpy ;
 lib_boost_numpy(3) = boost_numpy3 ;
 
-lib_boost_numpy($(py2-version)) = $(lib_boost_python(2)) ;
-lib_boost_numpy($(py3-version)) = $(lib_boost_python(3)) ;
+lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
+lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
 
 rule lib_boost_numpy ( version )
 {

config/cxx.py

@@ -15,7 +15,7 @@ def add_options(vars):
 
 def check(context):
 
-    source = r"""#if __cplusplus < 201103L
+    source = r"""#if __cplusplus < 201103L && (!defined(_MSC_VER) || _MSC_VER < 1800) 
 #error no C++11
 #endif"""
 

doc/reference/indexing.qbk

@@ -38,7 +38,7 @@ The `indexing_suite` class is the base class for the management of C++ container
 [[__iter__(self)]
  [This method is called when an iterator is required for a container. This method should return a new iterator object that can iterate over all the objects in the container. For mappings, it should iterate over the keys of the container, and should also be made available as the method iterkeys().
 
-Iterator objects also need to implement this method; they are required to return themselves. For more information on iterator objects, see [@http://www.python.org/doc/current/lib/typeiter.html Iterator Types] in the [@http://www.python.org/doc/current/lib/lib.html Python Library Reference].]]
+Iterator objects also need to implement this method; they are required to return themselves. For more information on iterator objects, see [@https://docs.python.org/3/library/stdtypes.html#iterator-types Iterator Types] in the [@https://docs.python.org/3/library/index.html Python Library Reference].]]
 
 [[__contains__(self, item)]
  [Called to implement membership test operators. Should return true if item is in self, false otherwise. For mapping objects, this should consider the keys of the mapping rather than the values or the key-item pairs.]]

doc/reference/numeric.qbk

@@ -1,153 +0,0 @@
-[section boost/python/numeric.hpp]
-[section Introduction]
-Exposes a [link concepts.objectwrapper.typewrapper_concept_requirements TypeWrapper] for the Python [@http://www.python.org/dev/doc/devel/lib/typesmapping.html array] type.
-[endsect]
-[section Class `array`]
-Provides access to the array types of [@http://www.pfdubois.com/numpy/ Numerical Python]\ 's [@http://www.pfdubois.com/numpy/#Numeric Numeric] and [@http://stsdas.stsci.edu/numarray/index.html NumArray] modules. With the exception of the functions documented below, the semantics of the constructors and member functions defined below can be fully understood by reading the [link concepts.objectwrapper.typewrapper_concept_requirements TypeWrapper] concept definition. Since array is publicly derived from object, the public object interface applies to array instances as well.
-
-The default behavior is to use numarray.NDArray as the associated Python type if the numarray module is installed in the default location. Otherwise it falls back to use Numeric.ArrayType. If neither extension module is installed, overloads of wrapped C++ functions with numeric::array parameters will never be matched, and other attempted uses of numeric::array will raise an appropriate Python exception. The associated Python type can be set manually using the set_module_and_type(...) static function.
-``
-namespace boost { namespace python { namespace numeric
-{
-   class array : public object
-   {
-    public:
-      object astype();
-      template <class Type>
-      object astype(Type const& type_);
-
-      template <class Type>
-      array new_(Type const& type_) const;
-
-      template <class Sequence> 
-      void resize(Sequence const& x);
-      void resize(long x1);
-      void resize(long x1, long x2);
-      ...
-      void resize(long x1, long x2,...long xn);
-
-      template <class Sequence> 
-      void setshape(Sequence const& x);
-      void setshape(long x1);
-      void setshape(long x1, long x2);
-      ...
-      void setshape(long x1, long x2,...long xn);
-
-      template <class Indices, class Values>
-      void put(Indices const& indices, Values const& values);
-
-      template <class Sequence>
-      object take(Sequence const& sequence, long axis = 0);
-
-      template <class File>
-      void tofile(File const& f) const;
-
-      object factory();
-      template <class Sequence>
-      object factory(Sequence const&);
-      template <class Sequence, class Typecode>
-      object factory(Sequence const&, Typecode const&, bool copy = true, bool savespace = false);
-      template <class Sequence, class Typecode, class Type>
-      object factory(Sequence const&, Typecode const&, bool copy, bool savespace, Type const&);
-      template <class Sequence, class Typecode, class Type, class Shape>
-      object factory(Sequence const&, Typecode const&, bool copy, bool savespace, Type const&, Shape const&);
-
-      template <class T1>
-      explicit array(T1 const& x1);
-      template <class T1, class T2>
-      explicit array(T1 const& x1, T2 const& x2);
-      ...
-      template <class T1, class T2,...class Tn>
-      explicit array(T1 const& x1, T2 const& x2,...Tn const& xn);
-
-      static void set_module_and_type();
-      static void set_module_and_type(char const* package_path = 0, char const* type_name = 0);
-      static void get_module_name();
-
-      object argmax(long axis=-1);
-
-      object argmin(long axis=-1);
-
-      object argsort(long axis=-1);
-
-      void byteswap();
-
-      object copy() const;
-
-      object diagonal(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-
-      void info() const;
-
-      bool is_c_array() const;
-      bool isbyteswapped() const;
-      void sort();
-      object trace(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      object type() const;
-      char typecode() const;
-      
-      object getflat() const;
-      long getrank() const;
-      object getshape() const;
-      bool isaligned() const;
-      bool iscontiguous() const;
-      long itemsize() const;
-      long nelements() const;
-      object nonzero() const;
-   
-      void ravel();
-      object repeat(object const& repeats, long axis=0);
-      void setflat(object const& flat);
-      void swapaxes(long axis1, long axis2);
-      str tostring() const;
-      void transpose(object const& axes = object());
-      object view() const;
-  };
-}}}
-``
-[endsect]
-[section Class `array` observer functions]
-``
-object factory();
-template <class Sequence>
-object factory(Sequence const&);
-template <class Sequence, class Typecode>
-object factory(Sequence const&, Typecode const&, bool copy = true, bool savespace = false);
-template <class Sequence, class Typecode, class Type>
-object factory(Sequence const&, Typecode const&, bool copy, bool savespace, Type const&);
-template <class Sequence, class Typecode, class Type, class Shape>
-object factory(Sequence const&, Typecode const&, bool copy, bool savespace, Type const&, Shape const&);
-``
-These functions map to the underlying array type's array() function family. They are not called "array" because of the C++ limitation that you can't define a member function with the same name as its enclosing class.
-``
-template <class Type>
-array new_(Type const&) const;
-``
-This function maps to the underlying array type's new() function. It is not called "new" because that is a keyword in C++. 
-[endsect]
-[section Class `array` static functions]
-``
-static void set_module_and_type(char const* package_path, char const* type_name);
-static void set_module_and_type();
-``
-[variablelist
-[[Requires][package_path and type_name, if supplied, is an [link ntbs].]]
-[[Effects][The first form sets the package path of the module that supplies the type named by type_name to package_path. The second form restores the default search behavior. The associated Python type will be searched for only the first time it is needed, and thereafter the first time it is needed after an invocation of set_module_and_type.]]
-]
-``static std::string get_module_name()``
-[variablelist
-[[Effects][Returns the name of the module containing the class that will be held by new `numeric::array` instances.]]
-]
-[endsect]
-[section Example]
-``
-#include <boost/python/numeric.hpp>
-#include <boost/python/tuple.hpp>
-
-// sets the first element in a 2d numeric array
-void set_first_element(numeric::array& y, double value)
-{
-    y[make_tuple(0,0)] = value;
-}
-``
-[endsect]
-[endsect]

doc/reference/objects.qbk

@@ -5,7 +5,6 @@
 [include dict.qbk]
 [include list.qbk]
 [include long.qbk]
-[include numeric.qbk]
 [include object.qbk]
 [include str.qbk]
 [include slice.qbk]

doc/reference/pickle.qbk

@@ -4,7 +4,7 @@ Pickle is a Python module for object serialization, also known as persistence, m
 
 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.
 
-The Boost Python Library supports the pickle module through the interface as described in detail in the [@http://www.python.org/doc/current/lib/module-pickle.html Python Library Reference for pickle]. This interface involves the special methods `__getinitargs__`, `__getstate__` and `__setstate__` as described in the following. Note that `Boost.Python` is also fully compatible with Python's cPickle module.
+The Boost Python Library supports the pickle module through the interface as described in detail in the [@https://docs.python.org/2/library/pickle.html Python Library Reference for pickle]. This interface involves the special methods `__getinitargs__`, `__getstate__` and `__setstate__` as described in the following. Note that `Boost.Python` is also fully compatible with Python's cPickle module.
 [endsect]
 [section The Pickle Interface]
 At the user level, the Boost.Python pickle interface involves three special methods:

doc/reference/slice.qbk

@@ -105,14 +105,6 @@ list odd_elements(list l)
     return l[slice(_,_,2)];
 }
 
-// Perform a multidimensional extended slice of a Numeric.array
-numeric::array even_columns(numeric::array arr)
-{
-    // select every other column, starting with the second, of a 2-D array.
-    // Equivalent to "return arr[:, 1::2]" in Python.
-    return arr[make_tuple( slice(), slice(1,_,2))];
-}
-
 // Perform a summation over a slice of a std::vector.
 double partial_sum(std::vector<double> const& Foo, const slice index)
 {

doc/tutorial.qbk

@@ -92,7 +92,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: [@../../../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.
 
@@ -1417,6 +1417,8 @@ eval evaluates the given expression and returns the resulting value.
 exec executes the given code (typically a set of statements) returning the result,
 and exec_file executes the code contained in the given file.
 
+There are also overloads taking `char const*` instead of str as the first argument.
+
 The [^globals] and [^locals] parameters are Python dictionaries
 containing the globals and locals of the context in which to run the code.
 For most intents and purposes you can use the namespace dictionary of the

fabscript

@@ -0,0 +1,80 @@
+# -*- python -*-
+#
+# Copyright (c) 2016 Stefan Seefeld
+# All rights reserved.
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+from faber.feature import set
+from faber.types import cxx
+from faber.tools.compiler import cxxflags, define, include
+from faber.tools.python import python
+from faber.config import report, cxx_checks
+from faber.config.try_run import try_run
+
+features += include('include')
+features += define('BOOST_ALL_NO_LIB')  # disable auto-linking
+boost_include = options.get_with('boost-include')
+if boost_include:
+    features += include(boost_include)
+python = python.instance()
+features |= set(python.include, python.linkpath, python.libs)
+
+class has_numpy(try_run):
+
+    src = r"""
+// If defined, enforces linking against PythonXXd.lib, which
+// is usually not included in Python environments.
+#undef _DEBUG
+#include "Python.h"
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#include "numpy/arrayobject.h"
+
+#if PY_VERSION_HEX >= 0x03000000
+void *initialize() { import_array();}
+#else
+void initialize() { import_array();}
+#endif
+
+int main()
+{
+  int result = 0;
+  Py_Initialize();
+  initialize();
+  if (PyErr_Occurred())
+  {
+    result = 1;
+  }
+  else
+  {
+    npy_intp dims = 2;
+    PyObject * a = PyArray_SimpleNew(1, &dims, NPY_INT);
+    if (!a) result = 1;
+    Py_DECREF(a);
+  }
+  Py_Finalize();
+  return result;
+}
+"""
+    def __init__(self, features=()):
+
+        inc = ''
+        try:
+            inc = python.check_python('import numpy; print(numpy.get_include())')
+            features |= include(inc)
+        except Exception:
+            # ignore errors, the check will fail during compilation...
+            pass
+        try_run.__init__(self, 'has_numpy', has_numpy.src, cxx, features,
+                         if_=(include(inc), define('HAS_NUMPY')))
+
+checks = [cxx_checks.has_cxx11(features, define('HAS_CXX11')),
+          has_numpy(features)]
+config = report('config', checks)
+
+src = module('src', features=config.use)
+test = module('test', features=config.use)
+
+default = src.default

include/boost/python.hpp

@@ -42,7 +42,6 @@
 # include <boost/python/make_function.hpp>
 # include <boost/python/manage_new_object.hpp>
 # include <boost/python/module.hpp>
-# include <boost/python/numeric.hpp>
 # include <boost/python/object.hpp>
 # include <boost/python/object_protocol.hpp>
 # include <boost/python/object_protocol_core.hpp>

include/boost/python/arg_from_python.hpp

@@ -9,7 +9,7 @@
 # include <boost/python/converter/arg_from_python.hpp>
 # if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \
     || BOOST_WORKAROUND(BOOST_INTEL_WIN, BOOST_TESTED_AT(800))
-# include <boost/type_traits/remove_cv.hpp>
+# include <boost/python/detail/type_traits.hpp>
 #endif
 
 namespace boost { namespace python { 
@@ -19,7 +19,7 @@ struct arg_from_python
     : converter::select_arg_from_python<
 # if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \
     || BOOST_WORKAROUND(BOOST_INTEL_WIN, BOOST_TESTED_AT(800))
-          typename boost::remove_cv<T>::type
+          typename detail::remove_cv<T>::type
 # else
           T
 # endif 
@@ -28,7 +28,7 @@ struct arg_from_python
     typedef typename converter::select_arg_from_python<
 # if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \
     || BOOST_WORKAROUND(BOOST_INTEL_WIN, BOOST_TESTED_AT(800))
-          typename boost::remove_cv<T>::type
+          typename detail::remove_cv<T>::type
 # else
           T
 # endif 

include/boost/python/args.hpp

@@ -11,10 +11,7 @@
 # include <boost/config.hpp>
 # include <boost/python/detail/preprocessor.hpp>
 # include <boost/python/detail/type_list.hpp>
-
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/remove_reference.hpp>
-# include <boost/type_traits/remove_cv.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 # include <boost/preprocessor/enum_params.hpp>
 # include <boost/preprocessor/repeat.hpp>
@@ -116,9 +113,9 @@ namespace detail
   template <class T>
   struct is_reference_to_keywords
   {
-      BOOST_STATIC_CONSTANT(bool, is_ref = is_reference<T>::value);
-      typedef typename remove_reference<T>::type deref;
-      typedef typename remove_cv<deref>::type key_t;
+      BOOST_STATIC_CONSTANT(bool, is_ref = detail::is_reference<T>::value);
+      typedef typename detail::remove_reference<T>::type deref;
+      typedef typename detail::remove_cv<deref>::type key_t;
       BOOST_STATIC_CONSTANT(bool, is_key = is_keywords<key_t>::value);
       BOOST_STATIC_CONSTANT(bool, value = (is_ref & is_key));
       

include/boost/python/bases.hpp

@@ -6,8 +6,8 @@
 # define BASES_DWA2002321_HPP
 
 # include <boost/python/detail/prefix.hpp>
-# include <boost/type_traits/object_traits.hpp>
 # include <boost/python/detail/type_list.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/mpl/bool.hpp>
 # include <boost/preprocessor/enum_params_with_a_default.hpp>

include/boost/python/cast.hpp

@@ -6,9 +6,8 @@
 # define CAST_DWA200269_HPP
 
 # include <boost/python/detail/prefix.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
-# include <boost/type_traits/same_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
 # include <boost/type.hpp>
 # include <boost/python/base_type_traits.hpp>
 # include <boost/python/detail/convertible.hpp>
@@ -76,9 +75,9 @@ namespace detail
   template <class Source, class Target>
   inline Target* upcast_impl(Source* x, Target*)
   {
-      typedef typename add_cv<Source>::type src_t;
-      typedef typename add_cv<Target>::type target_t;
-      bool const same = is_same<src_t,target_t>::value;
+      typedef typename detail::add_cv<Source>::type src_t;
+      typedef typename detail::add_cv<Target>::type target_t;
+      bool const same = detail::is_same<src_t,target_t>::value;
       
       return detail::upcaster<same>::execute(x, (Target*)0);
   }

include/boost/python/class.hpp

@@ -28,13 +28,10 @@
 # include <boost/python/detail/operator_id.hpp>
 # include <boost/python/detail/def_helper.hpp>
 # include <boost/python/detail/force_instantiate.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/detail/unwrap_type_id.hpp>
 # include <boost/python/detail/unwrap_wrapper.hpp>
 
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/is_member_function_pointer.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-
 # include <boost/mpl/size.hpp>
 # include <boost/mpl/for_each.hpp>
 # include <boost/mpl/bool.hpp>
@@ -53,7 +50,6 @@
 
 # ifdef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
 #  include <boost/mpl/and.hpp>
-#  include <boost/type_traits/is_member_pointer.hpp>
 # endif
 
 namespace boost { namespace python {
@@ -84,8 +80,8 @@ namespace detail
   template <class T>
   struct is_data_member_pointer
       : mpl::and_<
-            is_member_pointer<T>
-          , mpl::not_<is_member_function_pointer<T> >
+            detail::is_member_pointer<T>
+          , mpl::not_<detail::is_member_function_pointer<T> >
         >
   {};
   
@@ -138,11 +134,11 @@ namespace detail
         must_be_derived_class_member(Default const&)
         {
             // https://svn.boost.org/trac/boost/ticket/5803
-            //typedef typename assertion<mpl::not_<is_same<Default,Fn> > >::failed test0;
+            //typedef typename assertion<mpl::not_<detail::is_same<Default,Fn> > >::failed test0;
 # if !BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-            typedef typename assertion<is_polymorphic<T> >::failed test1 BOOST_ATTRIBUTE_UNUSED;
+            typedef typename assertion<detail::is_polymorphic<T> >::failed test1 BOOST_ATTRIBUTE_UNUSED;
 # endif 
-            typedef typename assertion<is_member_function_pointer<Fn> >::failed test2 BOOST_ATTRIBUTE_UNUSED;
+            typedef typename assertion<detail::is_member_function_pointer<Fn> >::failed test2 BOOST_ATTRIBUTE_UNUSED;
             not_a_derived_class_member<Default>(Fn());
         }
     };

include/boost/python/converter/arg_from_python.hpp

@@ -8,8 +8,7 @@
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/from_python.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/converter/rvalue_from_python_data.hpp>
 # include <boost/mpl/eval_if.hpp>
 # include <boost/mpl/if.hpp>
@@ -106,7 +105,7 @@ struct reference_arg_from_python : arg_lvalue_from_python_base
 template <class T>
 struct arg_rvalue_from_python
 {
-    typedef typename boost::add_reference<
+    typedef typename boost::python::detail::add_lvalue_reference<
         T
         // We can't add_const here, or it would be impossible to pass
         // auto_ptr<U> args from Python to C++

include/boost/python/converter/arg_to_python.hpp

@@ -24,11 +24,7 @@
 # include <boost/python/detail/convertible.hpp>
 # include <boost/python/detail/string_literal.hpp>
 # include <boost/python/detail/value_is_shared_ptr.hpp>
-
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/type_traits/composite_traits.hpp>
-# include <boost/type_traits/function_traits.hpp>
-
+# include <boost/python/detail/type_traits.hpp>
 
 # include <boost/mpl/or.hpp>
 
@@ -116,9 +112,9 @@ namespace detail
       
             , typename mpl::if_<
                 mpl::or_<
-                    is_function<T>
+                    boost::python::detail::is_function<T>
                   , indirect_traits::is_pointer_to_function<T>
-                  , is_member_function_pointer<T>
+                  , boost::python::detail::is_member_function_pointer<T>
                 >
                 , function_arg_to_python<T>
 
@@ -127,7 +123,7 @@ namespace detail
                     , object_manager_arg_to_python<T>
 
                     , typename mpl::if_<
-                          is_pointer<T>
+                          boost::python::detail::is_pointer<T>
                         , pointer_deep_arg_to_python<T>
 
                         , typename mpl::if_<

include/boost/python/converter/object_manager.hpp

@@ -8,7 +8,7 @@
 # include <boost/python/handle.hpp>
 # include <boost/python/cast.hpp>
 # include <boost/python/converter/pyobject_traits.hpp>
-# include <boost/type_traits/object_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
 # include <boost/mpl/bool.hpp>

include/boost/python/converter/pointer_type_id.hpp

@@ -6,7 +6,7 @@
 # define POINTER_TYPE_ID_DWA2002222_HPP
 
 # include <boost/python/type_id.hpp>
-# include <boost/type_traits/composite_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
@@ -59,7 +59,7 @@ template <class T>
 type_info pointer_type_id(T(*)() = 0)
 {
     return detail::pointer_typeid_select<
-          is_reference<T>::value
+          boost::python::detail::is_lvalue_reference<T>::value
         >::execute((T(*)())0);
 }
 

include/boost/python/converter/pyobject_type.hpp

@@ -9,8 +9,11 @@
 
 namespace boost { namespace python { namespace converter { 
 
-BOOST_PYTHON_DECL PyObject* checked_downcast_impl(PyObject*, PyTypeObject*);
-
+BOOST_PYTHON_DECL inline
+PyObject* checked_downcast_impl(PyObject *obj, PyTypeObject *type)
+{
+  return (PyType_IsSubtype(Py_TYPE(obj), type) ? obj : NULL);
+}
 // Used as a base class for specializations which need to provide
 // Python type checking capability.
 template <class Object, PyTypeObject* pytype>

include/boost/python/converter/pytype_function.hpp

@@ -8,6 +8,7 @@
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/registered.hpp>
 #  include <boost/python/detail/unwind_type.hpp>
+#  include <boost/python/detail/type_traits.hpp>
 
 
 namespace boost { namespace python {
@@ -53,7 +54,7 @@ inline python::type_info unwind_type_id_(boost::type<void>* = 0, mpl::true_* =0)
 template <class T>
 inline python::type_info unwind_type_id(boost::type<T>* p= 0)
 {
-    return unwind_type_id_(p, (mpl::bool_<boost::is_void<T>::value >*)0 );
+    return unwind_type_id_(p, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 );
 }
 }
 
@@ -64,7 +65,7 @@ struct expected_pytype_for_arg
     static PyTypeObject const *get_pytype()
     {
         const converter::registration *r=converter::registry::query(
-            detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::is_void<T>::value >*)0 )
+            detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 )
             );
         return r ? r->expected_from_python_type(): 0;
     }
@@ -77,7 +78,7 @@ struct registered_pytype
     static PyTypeObject const *get_pytype()
     {
         const converter::registration *r=converter::registry::query(
-            detail::unwind_type_id_((boost::type<T>*) 0, (mpl::bool_<boost::is_void<T>::value >*)0 )
+            detail::unwind_type_id_((boost::type<T>*) 0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 )
             );
         return r ? r->m_class_object: 0;
     }
@@ -111,7 +112,7 @@ struct to_python_target_type
     static PyTypeObject const *get_pytype()
     {
         const converter::registration *r=converter::registry::query(
-            detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::is_void<T>::value >*)0 )
+            detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 )
             );
         return r ? r->to_python_target_type(): 0;
     }

include/boost/python/converter/registered.hpp

@@ -10,9 +10,7 @@
 #include <boost/python/type_id.hpp>
 #include <boost/python/converter/registry.hpp>
 #include <boost/python/converter/registrations.hpp>
-#include <boost/type_traits/transform_traits.hpp>
-#include <boost/type_traits/cv_traits.hpp>
-#include <boost/type_traits/is_void.hpp>
+#include <boost/python/detail/type_traits.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/type.hpp>
 #include <memory>
@@ -44,8 +42,8 @@ namespace detail
 template <class T>
 struct registered
   : detail::registered_base<
-        typename add_reference<
-            typename add_cv<T>::type
+        typename boost::python::detail::add_lvalue_reference<
+            typename boost::python::detail::add_cv<T>::type
         >::type
     >
 {
@@ -78,7 +76,7 @@ namespace detail
       registry::lookup_shared_ptr(type_id<shared_ptr<T> >());
   }
 
-#if __cplusplus >= 201103L
+#if !defined(BOOST_NO_CXX11_SMART_PTR)
   template <class T>
   inline void
   register_shared_ptr0(std::shared_ptr<T>*)

include/boost/python/converter/registered_pointee.hpp

@@ -7,8 +7,7 @@
 # include <boost/python/converter/registered.hpp>
 # include <boost/python/converter/pointer_type_id.hpp>
 # include <boost/python/converter/registry.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
@@ -17,9 +16,9 @@ struct registration;
 template <class T>
 struct registered_pointee
     : registered<
-        typename remove_pointer<
-           typename remove_cv<
-              typename remove_reference<T>::type
+        typename boost::python::detail::remove_pointer<
+           typename boost::python::detail::remove_cv<
+              typename boost::python::detail::remove_reference<T>::type
            >::type
         >::type
     >

include/boost/python/converter/return_from_python.hpp

@@ -14,7 +14,7 @@
 # include <boost/python/detail/void_return.hpp>
 # include <boost/python/errors.hpp>
 # include <boost/python/handle.hpp>
-# include <boost/type_traits/has_trivial_copy.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/and.hpp>
 # include <boost/mpl/bool.hpp>
 

include/boost/python/converter/rvalue_from_python_data.hpp

@@ -8,9 +8,8 @@
 # include <boost/python/converter/constructor_function.hpp>
 # include <boost/python/detail/referent_storage.hpp>
 # include <boost/python/detail/destroy.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/static_assert.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_cv.hpp>
 # include <cstddef>
 
 // Data management for potential rvalue conversions from Python to C++
@@ -78,7 +77,7 @@ struct rvalue_from_python_storage
 
     // Storage for the result, in case an rvalue must be constructed
     typename python::detail::referent_storage<
-        typename add_reference<T>::type
+        typename boost::python::detail::add_lvalue_reference<T>::type
     >::type storage;
 };
 
@@ -110,7 +109,8 @@ struct rvalue_from_python_data : rvalue_from_python_storage<T>
     // Destroys any object constructed in the storage.
     ~rvalue_from_python_data();
  private:
-    typedef typename add_reference<typename add_cv<T>::type>::type ref_type;
+    typedef typename boost::python::detail::add_lvalue_reference<
+                typename boost::python::detail::add_cv<T>::type>::type ref_type;
 };
 
 //

include/boost/python/converter/shared_ptr_to_python.hpp

@@ -25,7 +25,7 @@ PyObject* shared_ptr_to_python(shared_ptr<T> const& x)
         return converter::registered<shared_ptr<T> const&>::converters.to_python(&x);
 }
 
-#if __cplusplus >= 201103L
+#if !defined(BOOST_NO_CXX11_SMART_PTR)
 template <class T>
 PyObject* shared_ptr_to_python(std::shared_ptr<T> const& x)
 {

include/boost/python/data_members.hpp

@@ -19,14 +19,7 @@
 # include <boost/python/detail/indirect_traits.hpp>
 # include <boost/python/detail/not_specified.hpp>
 # include <boost/python/detail/value_arg.hpp>
-
-# include <boost/type_traits/add_const.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/is_member_pointer.hpp>
-
-# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-#  include <boost/type_traits/remove_cv.hpp>
-# endif 
+# include <boost/python/detail/type_traits.hpp>
 
 # include <boost/mpl/eval_if.hpp>
 # include <boost/mpl/if.hpp>
@@ -147,20 +140,20 @@ namespace detail
   // boost::python::make_getter are used to dispatch behavior.  The
   // third argument is a workaround for a CWPro8 partial ordering bug
   // with pointers to data members.  It should be convertible to
-  // mpl::true_ iff the first argument is a pointer-to-member, and
-  // mpl::false_ otherwise.  The fourth argument is for compilers
+  // detail::true_ iff the first argument is a pointer-to-member, and
+  // detail::false_ otherwise.  The fourth argument is for compilers
   // which don't support partial ordering at all and should always be
   // passed 0L.
-  //
+
 
 #if BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
   template <class D, class P>
-  inline object make_getter(D& d, P& p, mpl::false_, ...);
+  inline object make_getter(D& d, P& p, detail::false_, ...);
 #endif
 
   // Handle non-member pointers with policies
   template <class D, class Policies>
-  inline object make_getter(D* d, Policies const& policies, mpl::false_, int)
+  inline object make_getter(D* d, Policies const& policies, detail::false_, int)
   {
       return python::make_function(
           detail::datum<D>(d), policies, mpl::vector1<D&>()
@@ -169,18 +162,18 @@ namespace detail
   
   // Handle non-member pointers without policies
   template <class D>
-  inline object make_getter(D* d, not_specified, mpl::false_, long)
+  inline object make_getter(D* d, not_specified, detail::false_, long)
   {
       typedef typename default_datum_getter_policy<D>::type policies;
-      return detail::make_getter(d, policies(), mpl::false_(), 0);
+      return detail::make_getter(d, policies(), detail::false_(), 0);
   }
 
   // Handle pointers-to-members with policies
   template <class C, class D, class Policies>
-  inline object make_getter(D C::*pm, Policies const& policies, mpl::true_, int)
+  inline object make_getter(D C::*pm, Policies const& policies, detail::true_, int)
   {
 #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-      typedef typename remove_cv<C>::type Class;
+      typedef typename detail::remove_cv<C>::type Class;
 #else
       typedef C Class;
 #endif 
@@ -193,18 +186,18 @@ namespace detail
       
   // Handle pointers-to-members without policies
   template <class C, class D>
-  inline object make_getter(D C::*pm, not_specified, mpl::true_, long)
+  inline object make_getter(D C::*pm, not_specified, detail::true_, long)
   {
       typedef typename default_member_getter_policy<D>::type policies;
-      return detail::make_getter(pm, policies(), mpl::true_(), 0);
+      return detail::make_getter(pm, policies(), detail::true_(), 0);
   }
 
   // Handle references
   template <class D, class P>
-  inline object make_getter(D& d, P& p, mpl::false_, ...)
+  inline object make_getter(D& d, P& p, detail::false_, ...)
   {
       // Just dispatch to the handler for pointer types.
-      return detail::make_getter(&d, p, mpl::false_(), 0L);
+      return detail::make_getter(&d, p, detail::false_(), 0L);
   }
 
   //
@@ -217,7 +210,7 @@ namespace detail
   
   // Handle non-member pointers
   template <class D, class Policies>
-  inline object make_setter(D* p, Policies const& policies, mpl::false_, int)
+  inline object make_setter(D* p, Policies const& policies, detail::false_, int)
   {
       return python::make_function(
           detail::datum<D>(p), policies, mpl::vector2<void,D const&>()
@@ -226,7 +219,7 @@ namespace detail
 
   // Handle pointers-to-members
   template <class C, class D, class Policies>
-  inline object make_setter(D C::*pm, Policies const& policies, mpl::true_, int)
+  inline object make_setter(D C::*pm, Policies const& policies, detail::true_, int)
   {
       return python::make_function(
           detail::member<D,C>(pm)
@@ -237,9 +230,9 @@ namespace detail
 
   // Handle references
   template <class D, class Policies>
-  inline object make_setter(D& x, Policies const& policies, mpl::false_, ...)
+  inline object make_setter(D& x, Policies const& policies, detail::false_, ...)
   {
-      return detail::make_setter(&x, policies, mpl::false_(), 0L);
+      return detail::make_setter(&x, policies, detail::false_(), 0L);
   }
 }
 
@@ -253,13 +246,13 @@ namespace detail
 template <class D, class Policies>
 inline object make_getter(D& d, Policies const& policies)
 {
-    return detail::make_getter(d, policies, is_member_pointer<D>(), 0L);
+    return detail::make_getter(d, policies, detail::is_member_pointer<D>(), 0L);
 }
 
 template <class D, class Policies>
 inline object make_getter(D const& d, Policies const& policies)
 {
-    return detail::make_getter(d, policies, is_member_pointer<D>(), 0L);
+    return detail::make_getter(d, policies, detail::is_member_pointer<D>(), 0L);
 }
 
 template <class D>
@@ -267,7 +260,7 @@ inline object make_getter(D& x)
 {
     detail::not_specified policy
         = detail::not_specified(); // suppress a SunPro warning
-    return detail::make_getter(x, policy, is_member_pointer<D>(), 0L);
+    return detail::make_getter(x, policy, detail::is_member_pointer<D>(), 0L);
 }
 
 #  if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
@@ -276,7 +269,7 @@ inline object make_getter(D const& d)
 {
     detail::not_specified policy
         = detail::not_specified(); // Suppress a SunPro warning
-    return detail::make_getter(d, policy, is_member_pointer<D>(), 0L);
+    return detail::make_getter(d, policy, detail::is_member_pointer<D>(), 0L);
 }
 #  endif
 
@@ -290,26 +283,26 @@ inline object make_getter(D const& d)
 template <class D, class Policies>
 inline object make_setter(D& x, Policies const& policies)
 {
-    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
+    return detail::make_setter(x, policies, detail::is_member_pointer<D>(), 0);
 }
 
 template <class D, class Policies>
 inline object make_setter(D const& x, Policies const& policies)
 {
-    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
+    return detail::make_setter(x, policies, detail::is_member_pointer<D>(), 0);
 }
 
 template <class D>
 inline object make_setter(D& x)
 {
-    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
+    return detail::make_setter(x, default_call_policies(), detail::is_member_pointer<D>(), 0);
 }
 
 # if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
 template <class D>
 inline object make_setter(D const& x)
 {
-    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
+    return detail::make_setter(x, default_call_policies(), detail::is_member_pointer<D>(), 0);
 }
 # endif
 

include/boost/python/default_call_policies.hpp

@@ -8,10 +8,8 @@
 # include <boost/python/detail/prefix.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/python/to_python_value.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/detail/value_arg.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/is_pointer.hpp>
-# include <boost/type_traits/is_reference.hpp>
 # include <boost/mpl/or.hpp>
 # include <boost/mpl/front.hpp>
 
@@ -64,7 +62,7 @@ struct default_result_converter
     struct apply
     {
         typedef typename mpl::if_<
-            mpl::or_<is_pointer<R>, is_reference<R> >
+            mpl::or_<detail::is_pointer<R>, detail::is_reference<R> >
           , detail::specify_a_return_value_policy_to_wrap_functions_returning<R>
           , boost::python::to_python_value<
                 typename detail::value_arg<R>::type

include/boost/python/detail/borrowed_ptr.hpp

@@ -8,8 +8,7 @@
 # include <boost/config.hpp>
 # include <boost/type.hpp>
 # include <boost/mpl/if.hpp>
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/tag.hpp>
 
 namespace boost { namespace python { namespace detail {

include/boost/python/detail/caller.hpp

@@ -16,6 +16,7 @@
 #  include <boost/python/detail/invoke.hpp>
 #  include <boost/python/detail/signature.hpp>
 #  include <boost/python/detail/preprocessor.hpp>
+#  include <boost/python/detail/type_traits.hpp>
 
 #  include <boost/python/arg_from_python.hpp>
 #  include <boost/python/converter/context_result_converter.hpp>
@@ -31,9 +32,6 @@
 
 #  include <boost/compressed_pair.hpp>
 
-#  include <boost/type_traits/is_same.hpp>
-#  include <boost/type_traits/is_convertible.hpp>
-
 #  include <boost/mpl/apply.hpp>
 #  include <boost/mpl/eval_if.hpp>
 #  include <boost/mpl/identity.hpp>
@@ -50,7 +48,7 @@ inline PyObject* get(mpl::int_<N>, PyObject* const& args_)
     return PyTuple_GET_ITEM(args_,N);
 }
 
-inline unsigned arity(PyObject* const& args_)
+inline Py_ssize_t arity(PyObject* const& args_)
 {
     return PyTuple_GET_SIZE(args_);
 }
@@ -236,7 +234,7 @@ struct caller_arity<N>
             typedef typename select_result_converter<Policies, rtype>::type result_converter;
 
             static const signature_element ret = {
-                (boost::is_void<rtype>::value ? "void" : type_id<rtype>().name())
+                (is_void<rtype>::value ? "void" : type_id<rtype>().name())
                 , &detail::converter_target_type<result_converter>::get_pytype
                 , boost::detail::indirect_traits::is_reference_to_non_const<rtype>::value 
             };

include/boost/python/detail/config.hpp

@@ -105,7 +105,11 @@
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:
 //
-#define BOOST_LIB_NAME boost_python
+#if PY_MAJOR_VERSION == 2
+#  define BOOST_LIB_NAME boost_python
+#elif PY_MAJOR_VERSION == 3
+#  define BOOST_LIB_NAME boost_python3
+#endif
 //
 // If we're importing code from a dll, then tell auto_link.hpp about it:
 //

include/boost/python/detail/convertible.hpp

@@ -7,11 +7,11 @@
 
 # if defined(__EDG_VERSION__) && __EDG_VERSION__ <= 241
 #  include <boost/mpl/if.hpp>
-#  include <boost/type_traits/conversion_traits.hpp>
+#  include <boost/python/detail/type_traits.hpp>
 # endif 
 
 // Supplies a runtime is_convertible check which can be used with tag
-// dispatching to work around the Metrowerks Pro7 limitation with boost::is_convertible
+// dispatching to work around the Metrowerks Pro7 limitation with boost/std::is_convertible
 namespace boost { namespace python { namespace detail { 
 
 typedef char* yes_convertible;

include/boost/python/detail/cv_category.hpp

@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 #ifndef CV_CATEGORY_DWA200222_HPP
 # define CV_CATEGORY_DWA200222_HPP
-# include <boost/type_traits/cv_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace detail { 
 
@@ -26,8 +26,8 @@ struct cv_category
 //    BOOST_STATIC_CONSTANT(bool, c = is_const<T>::value);
 //    BOOST_STATIC_CONSTANT(bool, v = is_volatile<T>::value);
     typedef cv_tag<
-        ::boost::is_const<T>::value
-      , ::boost::is_volatile<T>::value
+        is_const<T>::value
+      , is_volatile<T>::value
     > type;
 };
 

include/boost/python/detail/dealloc.hpp

@@ -1,4 +1,4 @@
-// Copyright Gottfried Ganßauge 2003.
+// Copyright Gottfried Ganßauge 2003.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

include/boost/python/detail/decorated_type_id.hpp

@@ -7,7 +7,7 @@
 
 # include <boost/python/type_id.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace detail { 
 

include/boost/python/detail/def_helper.hpp

@@ -6,12 +6,11 @@
 # define DEF_HELPER_DWA200287_HPP
 
 # include <boost/python/args.hpp>
-# include <boost/type_traits/same_traits.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/not.hpp>
 # include <boost/mpl/and.hpp>
 # include <boost/mpl/or.hpp>
-# include <boost/type_traits/add_reference.hpp>
 # include <boost/mpl/lambda.hpp>
 # include <boost/mpl/apply.hpp>
 # include <boost/tuple/tuple.hpp>
@@ -73,7 +72,8 @@ namespace detail
   struct tuple_extract_base_select
   {
       typedef typename Tuple::head_type head_type;
-      typedef typename mpl::apply1<Predicate, typename add_reference<head_type>::type>::type match_t;
+      typedef typename mpl::apply1<Predicate,
+              typename add_lvalue_reference<head_type>::type>::type match_t;
       BOOST_STATIC_CONSTANT(bool, match = match_t::value);
       typedef typename tuple_extract_impl<match>::template apply<Tuple,Predicate> type;
   };

include/boost/python/detail/defaults_def.hpp

@@ -12,7 +12,7 @@
 #define DEFAULTS_DEF_JDG20020811_HPP
 
 #include <boost/python/detail/defaults_gen.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/python/detail/type_traits.hpp>
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/static_assert.hpp>
@@ -238,7 +238,7 @@ namespace detail
       typedef typename OverloadsT::non_void_return_type non_void_return_type;
 
       typedef typename mpl::if_c<
-          boost::is_same<void, return_type>::value
+          is_same<void, return_type>::value
           , void_return_type
           , non_void_return_type
       >::type stubs_type;

include/boost/python/detail/destroy.hpp

@@ -5,7 +5,7 @@
 #ifndef DESTROY_DWA2002221_HPP
 # define DESTROY_DWA2002221_HPP
 
-# include <boost/type_traits/is_array.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/detail/workaround.hpp>
 namespace boost { namespace python { namespace detail { 
 
@@ -30,7 +30,7 @@ struct value_destroyer<true>
         for (T const volatile* p = first; p != first + sizeof(A)/sizeof(T); ++p)
         {
             value_destroyer<
-                boost::is_array<T>::value
+                is_array<T>::value
             >::execute(p);
         }
     }
@@ -48,7 +48,7 @@ inline void destroy_referent_impl(void* p, T& (*)())
     // note: cv-qualification needed for MSVC6
     // must come *before* T for metrowerks
     value_destroyer<
-         (boost::is_array<T>::value)
+         (is_array<T>::value)
     >::execute((const volatile T*)p);
 }
 

include/boost/python/detail/invoke.hpp

@@ -11,8 +11,6 @@
 #  include <boost/python/detail/preprocessor.hpp>
 #  include <boost/python/detail/none.hpp>
 
-#  include <boost/type_traits/is_member_function_pointer.hpp>
-
 #  include <boost/preprocessor/iterate.hpp>
 #  include <boost/preprocessor/facilities/intercept.hpp>
 #  include <boost/preprocessor/repetition/enum_trailing_params.hpp>

include/boost/python/detail/is_shared_ptr.hpp

@@ -13,7 +13,7 @@
 namespace boost { namespace python { namespace detail { 
 
 BOOST_PYTHON_IS_XXX_DEF(shared_ptr, shared_ptr, 1)
-#if __cplusplus >= 201103L
+#if !defined(BOOST_NO_CXX11_SMART_PTR)
 template <typename T>
 struct is_shared_ptr<std::shared_ptr<T> > : std::true_type {};
 #endif

include/boost/python/detail/pointee.hpp

@@ -5,7 +5,7 @@
 #ifndef POINTEE_DWA2002323_HPP
 # define POINTEE_DWA2002323_HPP
 
-# include <boost/type_traits/object_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace detail { 
 

include/boost/python/detail/result.hpp

@@ -11,8 +11,8 @@
 #  include <boost/type.hpp>
 
 #  include <boost/python/detail/preprocessor.hpp>
+#  include <boost/python/detail/type_traits.hpp>
 
-#  include <boost/type_traits/object_traits.hpp>
 #  include <boost/mpl/if.hpp>
 
 #  include <boost/preprocessor/comma_if.hpp>

include/boost/python/detail/string_literal.hpp

@@ -7,8 +7,7 @@
 
 # include <cstddef>
 # include <boost/type.hpp>
-# include <boost/type_traits/array_traits.hpp>
-# include <boost/type_traits/same_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/bool.hpp>
 # include <boost/detail/workaround.hpp>
 

include/boost/python/detail/translate_exception.hpp

@@ -6,11 +6,9 @@
 # define TRANSLATE_EXCEPTION_TDS20091020_HPP
 
 # include <boost/python/detail/exception_handler.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 # include <boost/call_traits.hpp>
-# include <boost/type_traits/add_const.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/remove_reference.hpp>
 
 # include <boost/function/function0.hpp>
 
@@ -33,7 +31,7 @@ struct translate_exception
         typename add_const<ExceptionType>::type
     >::type exception_non_ref;
 # else
-    typedef typename add_reference<
+    typedef typename add_lvalue_reference<
         typename add_const<ExceptionType>::type
     >::type exception_cref;
 # endif

include/boost/python/detail/type_traits.hpp

@@ -0,0 +1,111 @@
+// Copyright Shreyans Doshi 2017.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PYTHON_DETAIL_TYPE_TRAITS_HPP
+# define BOOST_PYTHON_DETAIL_TYPE_TRAITS_HPP
+
+
+#include <boost/config.hpp>
+#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
+# include <boost/type_traits/transform_traits.hpp>
+# include <boost/type_traits/same_traits.hpp>
+# include <boost/type_traits/cv_traits.hpp>
+# include <boost/type_traits/is_polymorphic.hpp>
+# include <boost/type_traits/composite_traits.hpp>
+# include <boost/type_traits/conversion_traits.hpp>
+# include <boost/type_traits/add_pointer.hpp>
+# include <boost/type_traits/remove_pointer.hpp>
+# include <boost/type_traits/is_void.hpp>
+# include <boost/type_traits/object_traits.hpp>
+# include <boost/type_traits/add_lvalue_reference.hpp>
+# include <boost/type_traits/function_traits.hpp>
+# include <boost/type_traits/is_scalar.hpp>
+# include <boost/type_traits/alignment_traits.hpp>
+# include <boost/mpl/bool.hpp>
+#else
+# include <type_traits>
+#endif
+
+# include <boost/type_traits/is_base_and_derived.hpp>
+# include <boost/type_traits/alignment_traits.hpp>
+# include <boost/type_traits/has_trivial_copy.hpp>
+
+
+namespace boost { namespace python { namespace detail {
+
+#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
+    using boost::alignment_of;
+    using boost::add_const;
+    using boost::add_cv;
+    using boost::add_lvalue_reference;
+    using boost::add_pointer;
+
+    using boost::is_array;
+    using boost::is_class;
+    using boost::is_const;
+    using boost::is_convertible;
+    using boost::is_enum;
+    using boost::is_function;
+    using boost::is_integral;
+    using boost::is_lvalue_reference;
+    using boost::is_member_function_pointer;
+    using boost::is_member_pointer;
+    using boost::is_pointer;
+    using boost::is_polymorphic;
+    using boost::is_reference;
+    using boost::is_same;
+    using boost::is_scalar;
+    using boost::is_union;
+    using boost::is_void;
+    using boost::is_volatile;
+
+    using boost::remove_reference;
+    using boost::remove_pointer;
+    using boost::remove_cv;
+    using boost::remove_const;
+
+    using boost::mpl::true_;
+    using boost::mpl::false_;
+#else
+    using std::alignment_of;
+    using std::add_const;
+    using std::add_cv;
+    using std::add_lvalue_reference;
+    using std::add_pointer;
+
+    using std::is_array;
+    using std::is_class;
+    using std::is_const;
+    using std::is_convertible;
+    using std::is_enum;
+    using std::is_function;
+    using std::is_integral;
+    using std::is_lvalue_reference;
+    using std::is_member_function_pointer;
+    using std::is_member_pointer;
+    using std::is_pointer;
+    using std::is_polymorphic;
+    using std::is_reference;
+    using std::is_same;
+    using std::is_scalar;
+    using std::is_union;
+    using std::is_void;
+    using std::is_volatile;
+
+    using std::remove_reference;
+    using std::remove_pointer;
+    using std::remove_cv;
+    using std::remove_const;
+
+    typedef std::integral_constant<bool, true> true_;
+    typedef std::integral_constant<bool, false> false_;
+#endif
+    using boost::is_base_and_derived;
+    using boost::type_with_alignment;
+    using boost::has_trivial_copy;
+}}} // namespace boost::python::detail
+
+
+#endif //BOOST_DETAIL_TYPE_TRAITS_HPP

include/boost/python/detail/unwind_type.hpp

@@ -7,7 +7,7 @@
 
 # include <boost/python/detail/cv_category.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/object_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace detail {
 
@@ -155,10 +155,10 @@ unwind_type(boost::type<U>*p =0, Generator* =0)
 #endif
 {
     BOOST_STATIC_CONSTANT(int, indirection
-        = (boost::is_pointer<U>::value ? pointer_ : 0)
+        = (is_pointer<U>::value ? pointer_ : 0)
                              + (indirect_traits::is_reference_to_pointer<U>::value
                              ? reference_to_pointer_
-                             : boost::is_reference<U>::value
+                             : is_lvalue_reference<U>::value
                              ? reference_
                              : 0));
 

include/boost/python/detail/value_arg.hpp

@@ -6,8 +6,7 @@
 
 # include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
 # include <boost/mpl/if.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_const.hpp>
+# include <boost/python/detail/indirect_traits.hpp>
 
 namespace boost { namespace python { namespace detail { 
 
@@ -16,7 +15,7 @@ struct value_arg
   : mpl::if_<
         copy_ctor_mutates_rhs<T>
       , T
-      , typename add_reference<
+      , typename add_lvalue_reference<
             typename add_const<T>::type
         >::type
   >

include/boost/python/detail/value_is_xxx.hpp

@@ -9,11 +9,11 @@
 # include <boost/mpl/bool.hpp>
 # include <boost/preprocessor/enum_params.hpp>
 
-
-#  include <boost/type_traits/remove_reference.hpp>
-#  include <boost/type_traits/remove_cv.hpp>
+# include <boost/python/detail/type_traits.hpp>
 #  include <boost/python/detail/is_xxx.hpp>
 
+namespace boost { namespace python { namespace detail {
+
 #  define BOOST_PYTHON_VALUE_IS_XXX_DEF(name, qualified_name, nargs)    \
 template <class X_>                                                     \
 struct value_is_##name                                                  \
@@ -24,9 +24,10 @@ struct value_is_##name                                                  \
                                   typename remove_reference<X_>::type   \
                                >::type                                  \
                            >::value);                                   \
-    typedef mpl::bool_<value> type;                                    \
+    typedef mpl::bool_<value> type;                                     \
                                                                         \
 };                                                              
 
+}}} // namespace boost::python::detail
 
 #endif // VALUE_IS_XXX_DWA2003224_HPP

include/boost/python/detail/void_ptr.hpp

@@ -5,7 +5,7 @@
 #ifndef VOID_PTR_DWA200239_HPP
 # define VOID_PTR_DWA200239_HPP
 
-# include <boost/type_traits/remove_cv.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace detail { 
 

include/boost/python/detail/wrapper_base.hpp

@@ -5,8 +5,7 @@
 # define WRAPPER_BASE_DWA2004722_HPP
 
 # include <boost/python/detail/prefix.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-# include <boost/mpl/bool.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python {
 
@@ -21,14 +20,14 @@ namespace detail
     inline PyObject* get_owner(wrapper_base const volatile& w);
 
     inline PyObject*
-    owner_impl(void const volatile* /*x*/, mpl::false_)
+    owner_impl(void const volatile* /*x*/, detail::false_)
     {
         return 0;
     }
     
     template <class T>
     inline PyObject*
-    owner_impl(T const volatile* x, mpl::true_);
+    owner_impl(T const volatile* x, detail::true_);
     
     template <class T>
     inline PyObject*
@@ -59,7 +58,7 @@ namespace detail
   {
     template <class T>
     inline PyObject*
-    owner_impl(T const volatile* x, mpl::true_)
+    owner_impl(T const volatile* x, detail::true_)
     {
         if (wrapper_base const volatile* w = dynamic_cast<wrapper_base const volatile*>(x))
         {

include/boost/python/exec.hpp

@@ -20,6 +20,10 @@ object
 BOOST_PYTHON_DECL
 eval(str string, object global = object(), object local = object());
 
+object 
+BOOST_PYTHON_DECL
+eval(char const *string, object global = object(), object local = object());
+
 // Execute an individual python statement from str.
 // global and local are the global and local scopes respectively,
 // used during execution.
@@ -27,6 +31,10 @@ object
 BOOST_PYTHON_DECL
 exec_statement(str string, object global = object(), object local = object());
 
+object 
+BOOST_PYTHON_DECL
+exec_statement(char const *string, object global = object(), object local = object());
+
 // Execute python source code from str.
 // global and local are the global and local scopes respectively,
 // used during execution.
@@ -34,6 +42,10 @@ object
 BOOST_PYTHON_DECL
 exec(str string, object global = object(), object local = object());
 
+object 
+BOOST_PYTHON_DECL
+exec(char const *string, object global = object(), object local = object());
+
 // Execute python source code from file filename.
 // global and local are the global and local scopes respectively,
 // used during execution.
@@ -41,6 +53,10 @@ object
 BOOST_PYTHON_DECL
 exec_file(str filename, object global = object(), object local = object());
 
+object 
+BOOST_PYTHON_DECL
+exec_file(char const *filename, object global = object(), object local = object());
+
 }
 }
 

include/boost/python/init.hpp

@@ -27,7 +27,7 @@
 #include <boost/mpl/joint_view.hpp>
 #include <boost/mpl/back.hpp>
 
-#include <boost/type_traits/is_same.hpp>
+#include <boost/python/detail/type_traits.hpp>
 
 #include <boost/preprocessor/enum_params_with_a_default.hpp>
 #include <boost/preprocessor/enum_params.hpp>

include/boost/python/iterator.hpp

@@ -8,12 +8,10 @@
 # include <boost/python/detail/prefix.hpp>
 
 # include <boost/python/detail/target.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/object/iterator.hpp>
 # include <boost/python/object_core.hpp>
 
-# 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:
@@ -80,7 +78,7 @@ namespace detail
 template <class T>
 struct iterators
     : detail::iterators_impl<
-        boost::is_const<T>::value
+        detail::is_const<T>::value
       >::template apply<T>
 {
 };

include/boost/python/lvalue_from_pytype.hpp

@@ -13,6 +13,7 @@
 # include <boost/python/type_id.hpp>
 # include <boost/python/converter/registry.hpp>
 # include <boost/python/detail/void_ptr.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python {
 
@@ -35,7 +36,7 @@ namespace detail
   {
       static inline void* execute(PyObject* op)
       {
-          typedef typename boost::add_reference<U>::type param;
+          typedef typename add_lvalue_reference<U>::type param;
           return &Extractor::execute(
               boost::python::detail::void_ptr_to_reference(
                   op, (param(*)())0 )

include/boost/python/make_constructor.hpp

@@ -43,19 +43,19 @@ namespace detail
 
    private:
       template <class U>
-      void dispatch(U* x, mpl::true_) const
+      void dispatch(U* x, detail::true_) const
       {
-#if __cplusplus < 201103L
+#if defined(BOOST_NO_CXX11_SMART_PTR)
 	std::auto_ptr<U> owner(x);
-	dispatch(owner, mpl::false_());
+	dispatch(owner, detail::false_());
 #else
 	std::unique_ptr<U> owner(x);
-	dispatch(std::move(owner), mpl::false_());
+	dispatch(std::move(owner), detail::false_());
 #endif
       }
       
       template <class Ptr>
-      void dispatch(Ptr x, mpl::false_) const
+      void dispatch(Ptr x, detail::false_) const
       {
           typedef typename pointee<Ptr>::type value_type;
           typedef objects::pointer_holder<Ptr,value_type> holder;
@@ -63,7 +63,7 @@ namespace detail
 
           void* memory = holder::allocate(this->m_self, offsetof(instance_t, storage), sizeof(holder));
           try {
-#if __cplusplus < 201103L
+#if defined(BOOST_NO_CXX11_SMART_PTR)
               (new (memory) holder(x))->install(this->m_self);
 #else
               (new (memory) holder(std::move(x)))->install(this->m_self);

include/boost/python/manage_new_object.hpp

@@ -7,9 +7,9 @@
 
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/python/to_python_indirect.hpp>
-# include <boost/type_traits/composite_traits.hpp>
 
 namespace boost { namespace python { 
 
@@ -29,7 +29,7 @@ struct manage_new_object
     struct apply
     {
         typedef typename mpl::if_c<
-            boost::is_pointer<T>::value
+            detail::is_pointer<T>::value
             , to_python_indirect<T, detail::make_owning_holder>
             , detail::manage_new_object_requires_a_pointer_return_type<T>
         >::type type;

include/boost/python/module_init.hpp

@@ -66,25 +66,9 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
 
 #  endif
 
-#  if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
-#   define BOOST_PYTHON_MODULE_INIT(name)                           \
-  void BOOST_PP_CAT(init_module_,name)();                           \
-extern "C" __declspec(dllexport) _BOOST_PYTHON_MODULE_INIT(name)
-
-#  elif BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
-
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-  void BOOST_PP_CAT(init_module_,name)();                               \
-extern "C" __attribute__ ((__visibility__("default"))) _BOOST_PYTHON_MODULE_INIT(name)
-
-#  else
-
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-  void BOOST_PP_CAT(init_module_,name)();                               \
-extern "C" _BOOST_PYTHON_MODULE_INIT(name)
-
-#  endif
+#  define BOOST_PYTHON_MODULE_INIT(name)                       \
+  void BOOST_PP_CAT(init_module_,name)();                      \
+extern "C" BOOST_SYMBOL_EXPORT _BOOST_PYTHON_MODULE_INIT(name)
 
 # endif
 

include/boost/python/numeric.hpp

@@ -1,242 +0,0 @@
-// Copyright David Abrahams 2002.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef NUMARRAY_DWA2002922_HPP
-# define NUMARRAY_DWA2002922_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/tuple.hpp>
-# include <boost/python/str.hpp>
-# include <boost/preprocessor/iteration/local.hpp>
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/repetition/enum.hpp>
-# include <boost/preprocessor/repetition/enum_params.hpp>
-# include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python { namespace numeric {
-
-class array;
-
-namespace aux
-{
-  struct BOOST_PYTHON_DECL array_base : object
-  {
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-      array_base(BOOST_PP_ENUM_PARAMS_Z(1, n, object const& x));
-# define BOOST_PP_LOCAL_LIMITS (1, 7)
-# include BOOST_PP_LOCAL_ITERATE()
-
-      object argmax(long axis=-1);
-      object argmin(long axis=-1);
-      object argsort(long axis=-1);
-      object astype(object const& type = object());
-      void byteswap();
-      object copy() const;
-      object diagonal(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      void info() const;
-      bool is_c_array() const;
-      bool isbyteswapped() const;
-      array new_(object type) const;
-      void sort();
-      object trace(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      object type() const;
-      char typecode() const;
-
-      object factory(
-          object const& sequence = object()
-        , object const& typecode = object()
-        , bool copy = true
-        , bool savespace = false
-        , object type = object()
-        , object shape = object());
-
-      object getflat() const;
-      long getrank() const;
-      object getshape() const;
-      bool isaligned() const;
-      bool iscontiguous() const;
-      long itemsize() const;
-      long nelements() const;
-      object nonzero() const;
-   
-      void put(object const& indices, object const& values);
-   
-      void ravel();
-   
-      object repeat(object const& repeats, long axis=0);
-   
-      void resize(object const& shape);
-      
-      void setflat(object const& flat);
-      void setshape(object const& shape);
-   
-      void swapaxes(long axis1, long axis2);
-   
-      object take(object const& sequence, long axis = 0) const;
-   
-      void tofile(object const& file) const;
-   
-      str tostring() const;
-   
-      void transpose(object const& axes = object());
-   
-      object view() const;
-
-   public: // implementation detail - do not touch.
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(array_base, object);
-  };
-
-  struct BOOST_PYTHON_DECL array_object_manager_traits
-  {
-      static bool check(PyObject* obj);
-      static detail::new_non_null_reference adopt(PyObject* obj);
-      static PyTypeObject const* get_pytype() ;
-  };
-} // namespace aux
-
-class array : public aux::array_base
-{
-    typedef aux::array_base base;
- public:
-
-    object astype() { return base::astype(); }
-    
-    template <class Type>
-    object astype(Type const& type_)
-    {
-        return base::astype(object(type_));
-    }
-
-    template <class Type>
-    array new_(Type const& type_) const
-    {
-        return base::new_(object(type_));
-    }
-
-    template <class Sequence>
-    void resize(Sequence const& x)
-    {
-        base::resize(object(x));
-    }
-    
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-      void resize(BOOST_PP_ENUM_PARAMS_Z(1, n, long x))              \
-      {                                                         \
-          resize(make_tuple(BOOST_PP_ENUM_PARAMS_Z(1, n, x)));       \
-      }
-# define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-# include BOOST_PP_LOCAL_ITERATE()
-
-    template <class Sequence>
-    void setshape(Sequence const& x)
-    {
-        base::setshape(object(x));
-    }
-    
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-    void setshape(BOOST_PP_ENUM_PARAMS_Z(1, n, long x))              \
-    {                                                           \
-        setshape(make_tuple(BOOST_PP_ENUM_PARAMS_Z(1, n, x)));       \
-    }
-# define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-# include BOOST_PP_LOCAL_ITERATE()
-
-    template <class Indices, class Values>
-    void put(Indices const& indices, Values const& values)
-    {
-        base::put(object(indices), object(values));
-    }
-    
-    template <class Sequence>
-    object take(Sequence const& sequence, long axis = 0)
-    {
-        return base::take(object(sequence), axis);
-    }
-
-    template <class File>
-    void tofile(File const& f) const
-    {
-        base::tofile(object(f));
-    }
-
-    object factory()
-    {
-        return base::factory();
-    }
-    
-    template <class Sequence>
-    object factory(Sequence const& sequence)
-    {
-        return base::factory(object(sequence));
-    }
-    
-    template <class Sequence, class Typecode>
-    object factory(
-        Sequence const& sequence
-      , Typecode const& typecode_
-      , bool copy = true
-      , bool savespace = false
-    )
-    {
-        return base::factory(object(sequence), object(typecode_), copy, savespace);
-    }
-
-    template <class Sequence, class Typecode, class Type>
-    object factory(
-        Sequence const& sequence
-      , Typecode const& typecode_
-      , bool copy
-      , bool savespace
-      , Type const& type
-    )
-    {
-        return base::factory(object(sequence), object(typecode_), copy, savespace, object(type));
-    }
-    
-    template <class Sequence, class Typecode, class Type, class Shape>
-    object factory(
-        Sequence const& sequence
-      , Typecode const& typecode_
-      , bool copy
-      , bool savespace
-      , Type const& type
-      , Shape const& shape
-    )
-    {
-        return base::factory(object(sequence), object(typecode_), copy, savespace, object(type), object(shape));
-    }
-    
-# define BOOST_PYTHON_ENUM_AS_OBJECT(z, n, x) object(BOOST_PP_CAT(x,n))
-# define BOOST_PP_LOCAL_MACRO(n)                                        \
-    template <BOOST_PP_ENUM_PARAMS_Z(1, n, class T)>                    \
-    explicit array(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, n, T, const& x))    \
-    : base(BOOST_PP_ENUM_1(n, BOOST_PYTHON_ENUM_AS_OBJECT, x))          \
-    {}
-# define BOOST_PP_LOCAL_LIMITS (1, 7)
-# include BOOST_PP_LOCAL_ITERATE()
-# undef BOOST_PYTHON_AS_OBJECT
-
-    static BOOST_PYTHON_DECL void set_module_and_type(char const* package_name = 0, char const* type_attribute_name = 0);
-    static BOOST_PYTHON_DECL std::string get_module_name();
-
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(array, base);
-};
-
-} // namespace boost::python::numeric
-
-namespace converter
-{
-  template <>
-  struct object_manager_traits< numeric::array >
-      : numeric::aux::array_object_manager_traits
-  {
-      BOOST_STATIC_CONSTANT(bool, is_specialized = true);
-  };
-}
-
-}} // namespace boost::python
-
-#endif // NUMARRAY_DWA2002922_HPP

include/boost/python/numpy/config.hpp

@@ -62,7 +62,11 @@
 // Set the name of our library, this will get undef'ed by auto_link.hpp
 // once it's done with it:
 //
-#define BOOST_LIB_NAME boost_numpy
+#if PY_MAJOR_VERSION == 2
+#  define BOOST_LIB_NAME boost_numpy
+#elif PY_MAJOR_VERSION == 3
+#  define BOOST_LIB_NAME boost_numpy3
+#endif
 //
 // If we're importing code from a dll, then tell auto_link.hpp about it:
 //
@@ -75,4 +79,6 @@
 #include <boost/config/auto_link.hpp>
 #endif  // auto-linking disabled
 
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+
 #endif // CONFIG_NUMPY20170215_H_

include/boost/python/numpy/dtype.hpp

@@ -13,11 +13,10 @@
  */
 
 #include <boost/python.hpp>
-#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
 #include <boost/python/numpy/config.hpp>
-
+#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
 #include <boost/mpl/for_each.hpp>
-#include <boost/type_traits/add_pointer.hpp>
+#include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace numpy {
 
@@ -56,7 +55,7 @@ public:
    *  This is more permissive than equality tests.  For instance, if long and int are the same
    *  size, the dtypes corresponding to each will be equivalent, but not equal.
    */
-  friend bool equivalent(dtype const & a, dtype const & b);
+  friend BOOST_NUMPY_DECL bool equivalent(dtype const & a, dtype const & b);
 
   /**
    *  @brief Register from-Python converters for NumPy's built-in array scalar types.
@@ -70,7 +69,7 @@ public:
 
 };
 
-bool equivalent(dtype const & a, dtype const & b);
+BOOST_NUMPY_DECL bool equivalent(dtype const & a, dtype const & b);
 
 namespace detail
 {
@@ -90,7 +89,7 @@ struct builtin_dtype<T,true> {
 };
 
 template <>
-struct builtin_dtype<bool,true> {
+struct BOOST_NUMPY_DECL builtin_dtype<bool,true> {
   static dtype get();
 };
 

include/boost/python/numpy/internal.hpp

@@ -15,6 +15,7 @@
  */
 
 #include <boost/python.hpp>
+#include <boost/python/numpy/config.hpp>
 #ifdef BOOST_PYTHON_NUMPY_INTERNAL
 #define NO_IMPORT_ARRAY
 #define NO_IMPORT_UFUNC

include/boost/python/numpy/invoke_matching.hpp

@@ -19,7 +19,7 @@ namespace boost { namespace python { namespace numpy {
 namespace detail 
 {
 
-struct add_pointer_meta 
+struct BOOST_NUMPY_DECL add_pointer_meta
 {
   template <typename T>
   struct apply 
@@ -29,8 +29,8 @@ struct add_pointer_meta
 
 };
 
-struct dtype_template_match_found {};
-struct nd_template_match_found {};
+struct BOOST_NUMPY_DECL dtype_template_match_found {};
+struct BOOST_NUMPY_DECL nd_template_match_found {};
 
 template <typename Function>
 struct dtype_template_invoker 

include/boost/python/numpy/matrix.hpp

@@ -61,7 +61,7 @@ public:
  *         return a numpy.matrix instead.
  */
 template <typename Base = default_call_policies>
-struct BOOST_NUMPY_DECL as_matrix : Base
+struct as_matrix : Base
 {
   static PyObject * postcall(PyObject *, PyObject * result)
   {

include/boost/python/numpy/ndarray.hpp

@@ -13,7 +13,7 @@
 
 #include <boost/python.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_integral.hpp>
+#include <boost/python/detail/type_traits.hpp>
 #include <boost/python/numpy/numpy_object_mgr_traits.hpp>
 #include <boost/python/numpy/dtype.hpp>
 #include <boost/python/numpy/config.hpp>
@@ -86,11 +86,11 @@ public:
   /// @brief Copy the scalar (deep for all non-object fields).
   ndarray copy() const;
 
-  /// @brief Return the size of the nth dimension.
-  Py_intptr_t shape(int n) const { return get_shape()[n]; }
+  /// @brief Return the size of the nth dimension. raises IndexError if k not in [-get_nd() : get_nd()-1 ]
+  Py_intptr_t shape(int n) const;
 
-  /// @brief Return the stride of the nth dimension.
-  Py_intptr_t strides(int n) const { return get_strides()[n]; }
+  /// @brief Return the stride of the nth dimension. raises IndexError if k not in [-get_nd() : get_nd()-1]
+  Py_intptr_t strides(int n) const;
     
   /**
    *  @brief Return the array's raw data pointer.
@@ -142,32 +142,32 @@ public:
 /**
  *  @brief Construct a new array with the given shape and data type, with data initialized to zero.
  */
-ndarray zeros(python::tuple const & shape, dtype const & dt);
-ndarray zeros(int nd, Py_intptr_t const * shape, dtype const & dt);
+BOOST_NUMPY_DECL ndarray zeros(python::tuple const & shape, dtype const & dt);
+BOOST_NUMPY_DECL ndarray zeros(int nd, Py_intptr_t const * shape, dtype const & dt);
 
 /**
  *  @brief Construct a new array with the given shape and data type, with data left uninitialized.
  */
-ndarray empty(python::tuple const & shape, dtype const & dt);
-ndarray empty(int nd, Py_intptr_t const * shape, dtype const & dt);
+BOOST_NUMPY_DECL ndarray empty(python::tuple const & shape, dtype const & dt);
+BOOST_NUMPY_DECL ndarray empty(int nd, Py_intptr_t const * shape, dtype const & dt);
 
 /**
  *  @brief Construct a new array from an arbitrary Python sequence.
  *
  *  @todo This does't seem to handle ndarray subtypes the same way that "numpy.array" does in Python.
  */
-ndarray array(object const & obj);
-ndarray array(object const & obj, dtype const & dt);
+BOOST_NUMPY_DECL ndarray array(object const & obj);
+BOOST_NUMPY_DECL ndarray array(object const & obj, dtype const & dt);
 
 namespace detail 
 {
 
-ndarray from_data_impl(void * data,
-		       dtype const & dt,
-		       std::vector<Py_intptr_t> const & shape,
-		       std::vector<Py_intptr_t> const & strides,
-		       object const & owner,
-		       bool writeable);
+BOOST_NUMPY_DECL ndarray from_data_impl(void * data,
+					dtype const & dt,
+					std::vector<Py_intptr_t> const & shape,
+					std::vector<Py_intptr_t> const & strides,
+					object const & owner,
+					bool writeable);
 
 template <typename Container>
 ndarray from_data_impl(void * data,
@@ -176,19 +176,19 @@ ndarray from_data_impl(void * data,
 		       Container strides,
 		       object const & owner,
 		       bool writeable,
-		       typename boost::enable_if< boost::is_integral<typename Container::value_type> >::type * enabled = NULL)
+		       typename boost::enable_if< boost::python::detail::is_integral<typename Container::value_type> >::type * enabled = NULL)
 {
   std::vector<Py_intptr_t> shape_(shape.begin(),shape.end());
   std::vector<Py_intptr_t> strides_(strides.begin(), strides.end());
   return from_data_impl(data, dt, shape_, strides_, owner, writeable);    
 }
 
-ndarray from_data_impl(void * data,
-		       dtype const & dt,
-		       object const & shape,
-		       object const & strides,
-		       object const & owner,
-		       bool writeable);
+BOOST_NUMPY_DECL ndarray from_data_impl(void * data,
+					dtype const & dt,
+					object const & shape,
+					object const & strides,
+					object const & owner,
+					bool writeable);
 
 } // namespace boost::python::numpy::detail
 
@@ -250,39 +250,53 @@ inline ndarray from_data(void const * data,
  *  @param[in] nd_max  Maximum number of dimensions.
  *  @param[in] flags   Bitwise OR of flags specifying additional requirements.
  */
-ndarray from_object(object const & obj, dtype const & dt,
-                    int nd_min, int nd_max, ndarray::bitflag flags=ndarray::NONE);
+BOOST_NUMPY_DECL ndarray from_object(object const & obj,
+				     dtype const & dt,
+				     int nd_min,
+				     int nd_max,
+				     ndarray::bitflag flags=ndarray::NONE);
 
-inline ndarray from_object(object const & obj, dtype const & dt,
-                           int nd, ndarray::bitflag flags=ndarray::NONE)
+BOOST_NUMPY_DECL inline ndarray from_object(object const & obj,
+					    dtype const & dt,
+					    int nd,
+					    ndarray::bitflag flags=ndarray::NONE)
 {
   return from_object(obj, dt, nd, nd, flags);
 }
 
-inline ndarray from_object(object const & obj, dtype const & dt, ndarray::bitflag flags=ndarray::NONE)
+BOOST_NUMPY_DECL inline ndarray from_object(object const & obj,
+					    dtype const & dt,
+					    ndarray::bitflag flags=ndarray::NONE)
 {
   return from_object(obj, dt, 0, 0, flags);
 }
 
-ndarray from_object(object const & obj, int nd_min, int nd_max,
-                    ndarray::bitflag flags=ndarray::NONE);
+BOOST_NUMPY_DECL ndarray from_object(object const & obj,
+				     int nd_min,
+				     int nd_max,
+				     ndarray::bitflag flags=ndarray::NONE);
 
-inline ndarray from_object(object const & obj, int nd, ndarray::bitflag flags=ndarray::NONE)
+BOOST_NUMPY_DECL inline ndarray from_object(object const & obj,
+					    int nd,
+					    ndarray::bitflag flags=ndarray::NONE)
 {
   return from_object(obj, nd, nd, flags);
 }
 
-inline ndarray from_object(object const & obj, ndarray::bitflag flags=ndarray::NONE)
+BOOST_NUMPY_DECL inline ndarray from_object(object const & obj,
+					    ndarray::bitflag flags=ndarray::NONE)
 {
   return from_object(obj, 0, 0, flags);
 }
 
-inline ndarray::bitflag operator|(ndarray::bitflag a, ndarray::bitflag b)
+BOOST_NUMPY_DECL inline ndarray::bitflag operator|(ndarray::bitflag a,
+						   ndarray::bitflag b)
 {
   return ndarray::bitflag(int(a) | int(b));
 }
 
-inline ndarray::bitflag operator&(ndarray::bitflag a, ndarray::bitflag b)
+BOOST_NUMPY_DECL inline ndarray::bitflag operator&(ndarray::bitflag a,
+						   ndarray::bitflag b)
 {
   return ndarray::bitflag(int(a) & int(b));
 }

include/boost/python/numpy/numpy_object_mgr_traits.hpp

@@ -7,6 +7,8 @@
 #ifndef boost_python_numpy_numpy_object_mgr_traits_hpp_
 #define boost_python_numpy_numpy_object_mgr_traits_hpp_
 
+#include <boost/python/numpy/config.hpp>
+
 /**
  *  @brief Macro that specializes object_manager_traits by requiring a 
  *         source-file implementation of get_pytype().
@@ -14,7 +16,7 @@
 
 #define NUMPY_OBJECT_MANAGER_TRAITS(manager)                            \
 template <>								\
-struct object_manager_traits<manager>					\
+struct BOOST_NUMPY_DECL object_manager_traits<manager>			\
 {									\
   BOOST_STATIC_CONSTANT(bool, is_specialized = true);			\
   static inline python::detail::new_reference adopt(PyObject* x)	\

include/boost/python/numpy/scalars.hpp

@@ -22,7 +22,7 @@ namespace boost { namespace python { namespace numpy {
  *
  *  @todo This could have a lot more functionality.
  */
-class void_ : public object
+class BOOST_NUMPY_DECL void_ : public object
 {
   static python::detail::new_reference convert(object_cref arg, bool align);
 public:

include/boost/python/numpy/ufunc.hpp

@@ -62,13 +62,13 @@ public:
 };
 
 /// @brief Construct a multi_iter over a single sequence or scalar object.
-multi_iter make_multi_iter(object const & a1);
+BOOST_NUMPY_DECL multi_iter make_multi_iter(object const & a1);
 
 /// @brief Construct a multi_iter by broadcasting two objects.
-multi_iter make_multi_iter(object const & a1, object const & a2);
+BOOST_NUMPY_DECL multi_iter make_multi_iter(object const & a1, object const & a2);
 
 /// @brief Construct a multi_iter by broadcasting three objects.
-multi_iter make_multi_iter(object const & a1, object const & a2, object const & a3);
+BOOST_NUMPY_DECL multi_iter make_multi_iter(object const & a1, object const & a2, object const & a3);
 
 /**
  *  @brief Helps wrap a C++ functor taking a single scalar argument as a broadcasting ufunc-like
@@ -106,7 +106,7 @@ struct unary_ufunc
     dtype in_dtype = dtype::get_builtin<TArgument>();
     dtype out_dtype = dtype::get_builtin<TResult>();
     ndarray in_array = from_object(input, in_dtype, ndarray::ALIGNED);
-    ndarray out_array = (output != object()) ?
+    ndarray out_array = ! output.is_none() ?
       from_object(output, out_dtype, ndarray::ALIGNED | ndarray::WRITEABLE)
       : zeros(in_array.get_nd(), in_array.get_shape(), out_dtype);
     multi_iter iter = make_multi_iter(in_array, out_array);
@@ -171,7 +171,7 @@ struct binary_ufunc
     ndarray in1_array = from_object(input1, in1_dtype, ndarray::ALIGNED);
     ndarray in2_array = from_object(input2, in2_dtype, ndarray::ALIGNED);
     multi_iter iter = make_multi_iter(in1_array, in2_array);
-    ndarray out_array = (output != object())
+    ndarray out_array = !output.is_none()
       ? from_object(output, out_dtype, ndarray::ALIGNED | ndarray::WRITEABLE)
       : zeros(iter.get_nd(), iter.get_shape(), out_dtype);
     iter = make_multi_iter(in1_array, in2_array, out_array);

include/boost/python/object/class_metadata.hpp

@@ -17,14 +17,11 @@
 
 #include <boost/python/detail/force_instantiate.hpp>
 #include <boost/python/detail/not_specified.hpp>
+#include <boost/python/detail/type_traits.hpp>
 
 #include <boost/python/has_back_reference.hpp>
 #include <boost/python/bases.hpp>
 
-#include <boost/type_traits/add_pointer.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_polymorphic.hpp>
-
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/bool.hpp>
@@ -35,9 +32,6 @@
 #include <boost/mpl/single_view.hpp>
 
 #include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/type_traits/is_convertible.hpp>
 
 #include <boost/noncopyable.hpp>
 #include <boost/detail/workaround.hpp>
@@ -56,7 +50,7 @@ struct register_base_of
     template <class Base>
     inline void operator()(Base*) const
     {
-        BOOST_MPL_ASSERT_NOT((is_same<Base,Derived>));
+        BOOST_MPL_ASSERT_NOT((boost::python::detail::is_same<Base,Derived>));
         
         // Register the Base class
         register_dynamic_id<Base>();
@@ -65,14 +59,14 @@ struct register_base_of
         register_conversion<Derived,Base>(false);
 
         // Register the down-cast, if appropriate.
-        this->register_downcast((Base*)0, is_polymorphic<Base>());
+        this->register_downcast((Base*)0, boost::python::detail::is_polymorphic<Base>());
     }
 
  private:
-    static inline void register_downcast(void*, mpl::false_) {}
+    static inline void register_downcast(void*, boost::python::detail::false_) {}
     
     template <class Base>
-    static inline void register_downcast(Base*, mpl::true_)
+    static inline void register_downcast(Base*, boost::python::detail::true_)
     {
         register_conversion<Base, Derived>(true);
     }
@@ -89,7 +83,7 @@ inline void register_shared_ptr_from_python_and_casts(T*, Bases)
 {
   // Constructor performs registration
   python::detail::force_instantiate(converter::shared_ptr_from_python<T, boost::shared_ptr>());
-#if __cplusplus >= 201103L
+#if !defined(BOOST_NO_CXX11_SMART_PTR)
   python::detail::force_instantiate(converter::shared_ptr_from_python<T, std::shared_ptr>());
 #endif
 
@@ -98,7 +92,7 @@ inline void register_shared_ptr_from_python_and_casts(T*, Bases)
   // interface to mpl::for_each to avoid an MSVC 6 bug.
   //
   register_dynamic_id<T>();
-  mpl::for_each(register_base_of<T>(), (Bases*)0, (add_pointer<mpl::_>*)0);
+  mpl::for_each(register_base_of<T>(), (Bases*)0, (boost::python::detail::add_pointer<mpl::_>*)0);
 }
 
 //
@@ -109,7 +103,7 @@ struct select_held_type
   : mpl::if_<
         mpl::or_<
             python::detail::specifies_bases<T>
-          , is_same<T,noncopyable>
+          , boost::python::detail::is_same<T,noncopyable>
         >
       , Prev
       , T
@@ -156,9 +150,9 @@ struct class_metadata
     >::type bases;
 
     typedef mpl::or_<
-        is_same<X1,noncopyable>
-      , is_same<X2,noncopyable>
-      , is_same<X3,noncopyable>
+        boost::python::detail::is_same<X1,noncopyable>
+      , boost::python::detail::is_same<X2,noncopyable>
+      , boost::python::detail::is_same<X3,noncopyable>
     > is_noncopyable;
     
     //
@@ -167,11 +161,11 @@ struct class_metadata
     
     // Compute the actual type that will be held in the Holder.
     typedef typename mpl::if_<
-        is_same<held_type_arg,python::detail::not_specified>, T, held_type_arg
+        boost::python::detail::is_same<held_type_arg,python::detail::not_specified>, T, held_type_arg
     >::type held_type;
 
     // Determine if the object will be held by value
-    typedef mpl::bool_<is_convertible<held_type*,T*>::value> use_value_holder;
+    typedef mpl::bool_<boost::python::detail::is_convertible<held_type*,T*>::value> use_value_holder;
     
     // Compute the "wrapped type", that is, if held_type is a smart
     // pointer, we're talking about the pointee.
@@ -185,7 +179,7 @@ struct class_metadata
     typedef mpl::bool_<
         mpl::or_<
             has_back_reference<T>
-          , is_same<held_type_arg,T>
+          , boost::python::detail::is_same<held_type_arg,T>
           , is_base_and_derived<T,wrapped>
         >::value
     > use_back_reference;
@@ -214,7 +208,7 @@ struct class_metadata
     template <class T2>
     inline static void register_aux(python::wrapper<T2>*) 
     {
-        typedef typename mpl::not_<is_same<T2,wrapped> >::type use_callback;
+        typedef typename mpl::not_<boost::python::detail::is_same<T2,wrapped> >::type use_callback;
         class_metadata::register_aux2((T2*)0, use_callback());
     }
 
@@ -243,7 +237,7 @@ struct class_metadata
     inline static void maybe_register_pointer_to_python(...) {}
 
 #ifndef BOOST_PYTHON_NO_PY_SIGNATURES
-    inline static void maybe_register_pointer_to_python(void*,void*,mpl::true_*) 
+    inline static void maybe_register_pointer_to_python(void*,void*,mpl::true_*)
     {
         objects::copy_class_object(python::type_id<T>(), python::type_id<back_reference<T const &> >());
         objects::copy_class_object(python::type_id<T>(), python::type_id<back_reference<T &> >());

include/boost/python/object/forward.hpp

@@ -6,11 +6,9 @@
 # define FORWARD_DWA20011215_HPP
 
 # include <boost/mpl/if.hpp>
-# include <boost/type_traits/is_scalar.hpp>
-# include <boost/type_traits/add_const.hpp>
-# include <boost/type_traits/add_reference.hpp>
 # include <boost/ref.hpp>
 # include <boost/python/detail/value_arg.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
 # include <boost/mpl/or.hpp>
 
@@ -22,7 +20,8 @@ namespace boost { namespace python { namespace objects {
 template <class T>
 struct reference_to_value
 {
-    typedef typename add_reference<typename add_const<T>::type>::type reference;
+    typedef typename boost::python::detail::add_lvalue_reference<typename
+        boost::python::detail::add_const<T>::type>::type reference;
     
     reference_to_value(reference x) : m_value(x) {}
     reference get() const { return m_value; }
@@ -36,7 +35,7 @@ struct reference_to_value
 template <class T>
 struct forward
     : mpl::if_<
-          mpl::or_<python::detail::copy_ctor_mutates_rhs<T>, is_scalar<T> >
+          mpl::or_<python::detail::copy_ctor_mutates_rhs<T>, boost::python::detail::is_scalar<T> >
         , T
         , reference_to_value<T>
       >
@@ -65,7 +64,7 @@ struct unforward_cref
 
 template<typename T>
 struct unforward_cref<reference_to_value<T> >
-  : add_reference<typename add_const<T>::type>
+  : boost::python::detail::add_lvalue_reference<typename boost::python::detail::add_const<T>::type>
 {
 };
 

include/boost/python/object/inheritance.hpp

@@ -8,9 +8,8 @@
 # include <boost/python/type_id.hpp>
 # include <boost/shared_ptr.hpp>
 # include <boost/mpl/if.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-# include <boost/type_traits/is_base_and_derived.hpp>
 # include <boost/detail/workaround.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 namespace boost { namespace python { namespace objects {
 
@@ -58,7 +57,7 @@ struct non_polymorphic_id_generator
 template <class T>
 struct dynamic_id_generator
   : mpl::if_<
-        boost::is_polymorphic<T>
+        boost::python::detail::is_polymorphic<T>
         , boost::python::objects::polymorphic_id_generator<T>
         , boost::python::objects::non_polymorphic_id_generator<T>
     >
@@ -104,7 +103,7 @@ struct implicit_cast_generator
 template <class Source, class Target>
 struct cast_generator
   : mpl::if_<
-        is_base_and_derived<Target,Source>
+        boost::python::detail::is_base_and_derived<Target,Source>
       , implicit_cast_generator<Source,Target>
       , dynamic_cast_generator<Source,Target>
     >

include/boost/python/object/instance.hpp

@@ -6,7 +6,7 @@
 # define INSTANCE_DWA200295_HPP
 
 # include <boost/python/detail/prefix.hpp>
-# include <boost/type_traits/alignment_traits.hpp>
+
 # include <cstddef>
 
 namespace boost { namespace python
@@ -25,8 +25,8 @@ struct instance
     PyObject* weakrefs; 
     instance_holder* objects;
 
-    typedef typename type_with_alignment<
-        ::boost::alignment_of<Data>::value
+    typedef typename boost::python::detail::type_with_alignment<
+        boost::python::detail::alignment_of<Data>::value
     >::type align_t;
           
     union

include/boost/python/object/iterator.hpp

@@ -6,6 +6,7 @@
 # define ITERATOR_DWA2002510_HPP
 
 # include <boost/python/detail/prefix.hpp>
+# include <boost/python/detail/type_traits.hpp>
 
 # include <boost/python/class.hpp>
 # include <boost/python/return_value_policy.hpp>
@@ -24,10 +25,6 @@
 
 # include <boost/type.hpp>
 
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_const.hpp>
-
 # include <boost/detail/iterator.hpp>
 
 namespace boost { namespace python { namespace objects {
@@ -202,8 +199,8 @@ inline object make_iterator_function(
 )
 {
     typedef typename Accessor1::result_type iterator;
-    typedef typename add_const<iterator>::type iterator_const;
-    typedef typename add_reference<iterator_const>::type iterator_cref;
+    typedef typename boost::python::detail::add_const<iterator>::type iterator_const;
+    typedef typename boost::python::detail::add_lvalue_reference<iterator_const>::type iterator_cref;
       
     return detail::make_iterator_function(
         get_start

include/boost/python/object/make_instance.hpp

@@ -9,10 +9,10 @@
 # include <boost/python/object/instance.hpp>
 # include <boost/python/converter/registered.hpp>
 # include <boost/python/detail/decref_guard.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/python/detail/none.hpp>
 # include <boost/mpl/assert.hpp>
 # include <boost/mpl/or.hpp>
-# include <boost/type_traits/is_union.hpp>
 
 namespace boost { namespace python { namespace objects { 
 
@@ -24,7 +24,8 @@ struct make_instance_impl
     template <class Arg>
     static inline PyObject* execute(Arg& x)
     {
-        BOOST_MPL_ASSERT((mpl::or_<is_class<T>, is_union<T> >));
+        BOOST_MPL_ASSERT((mpl::or_<boost::python::detail::is_class<T>,
+                boost::python::detail::is_union<T> >));
 
         PyTypeObject* type = Derived::get_class_object(x);
 

include/boost/python/object/make_ptr_instance.hpp

@@ -7,7 +7,7 @@
 
 # include <boost/python/object/make_instance.hpp>
 # include <boost/python/converter/registry.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
+# include <boost/python/detail/type_traits.hpp>
 # include <boost/get_pointer.hpp>
 # include <boost/detail/workaround.hpp>
 # include <typeinfo>
@@ -21,7 +21,7 @@ struct make_ptr_instance
     template <class Arg>
     static inline Holder* construct(void* storage, PyObject*, Arg& x)
     {
-#if __cplusplus < 201103L
+#if defined(BOOST_NO_CXX11_SMART_PTR)
       return new (storage) Holder(x);
 #else
       return new (storage) Holder(std::move(x));
@@ -47,7 +47,7 @@ struct make_ptr_instance
             return 0; // means "return None".
 
         PyTypeObject* derived = get_derived_class_object(
-            BOOST_DEDUCED_TYPENAME is_polymorphic<U>::type(), p);
+            BOOST_DEDUCED_TYPENAME boost::python::detail::is_polymorphic<U>::type(), p);
         
         if (derived)
             return derived;
@@ -55,16 +55,16 @@ struct make_ptr_instance
     }
     
     template <class U>
-    static inline PyTypeObject* get_derived_class_object(mpl::true_, U const volatile* x)
+    static inline PyTypeObject* get_derived_class_object(boost::python::detail::true_, U const volatile* x)
     {
         converter::registration const* r = converter::registry::query(
-            type_info(typeid(*get_pointer(x)))
+            type_info(typeid(*x))
         );
         return r ? r->m_class_object : 0;
     }
     
     template <class U>
-    static inline PyTypeObject* get_derived_class_object(mpl::false_, U*)
+    static inline PyTypeObject* get_derived_class_object(boost::python::detail::false_, U*)
     {
         return 0;
     }