15 files changed, 7 insertions, 6 deletions
diff --git a/boost/python/detail/caller.hpp b/boost/python/detail/caller.hpp
index c572d35aa9..1bd30bfb5a 100644
--- a/boost/python/detail/caller.hpp
+++ b/boost/python/detail/caller.hpp
@@ -48,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_);
 }
diff --git a/boost/python/detail/convertible.hpp b/boost/python/detail/convertible.hpp
index 1ff350ec24..1ff350ec24 100755..100644
--- a/boost/python/detail/convertible.hpp
+++ b/boost/python/detail/convertible.hpp
diff --git a/boost/python/detail/copy_ctor_mutates_rhs.hpp b/boost/python/detail/copy_ctor_mutates_rhs.hpp
index 4ca8d03911..4ca8d03911 100755..100644
--- a/boost/python/detail/copy_ctor_mutates_rhs.hpp
+++ b/boost/python/detail/copy_ctor_mutates_rhs.hpp
diff --git a/boost/python/detail/def_helper_fwd.hpp b/boost/python/detail/def_helper_fwd.hpp
index 31c22e97a3..31c22e97a3 100755..100644
--- a/boost/python/detail/def_helper_fwd.hpp
+++ b/boost/python/detail/def_helper_fwd.hpp
diff --git a/boost/python/detail/is_shared_ptr.hpp b/boost/python/detail/is_shared_ptr.hpp
index bef0e05afb..383383bc12 100755..100644
--- a/boost/python/detail/is_shared_ptr.hpp
+++ b/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
diff --git a/boost/python/detail/is_wrapper.hpp b/boost/python/detail/is_wrapper.hpp
index d7bce7b627..d7bce7b627 100755..100644
--- a/boost/python/detail/is_wrapper.hpp
+++ b/boost/python/detail/is_wrapper.hpp
diff --git a/boost/python/detail/nullary_function_adaptor.hpp b/boost/python/detail/nullary_function_adaptor.hpp
index 9dcc434f8e..9dcc434f8e 100755..100644
--- a/boost/python/detail/nullary_function_adaptor.hpp
+++ b/boost/python/detail/nullary_function_adaptor.hpp
diff --git a/boost/python/detail/prefix.hpp b/boost/python/detail/prefix.hpp
index 8b34ed7701..8b34ed7701 100755..100644
--- a/boost/python/detail/prefix.hpp
+++ b/boost/python/detail/prefix.hpp
diff --git a/boost/python/detail/python_type.hpp b/boost/python/detail/python_type.hpp
index f7630c175a..f7630c175a 100755..100644
--- a/boost/python/detail/python_type.hpp
+++ b/boost/python/detail/python_type.hpp
diff --git a/boost/python/detail/sfinae.hpp b/boost/python/detail/sfinae.hpp
index 6281875111..6281875111 100755..100644
--- a/boost/python/detail/sfinae.hpp
+++ b/boost/python/detail/sfinae.hpp
diff --git a/boost/python/detail/type_traits.hpp b/boost/python/detail/type_traits.hpp
index df940c7ea2..fda54c80f2 100644
--- a/boost/python/detail/type_traits.hpp
+++ b/boost/python/detail/type_traits.hpp
@@ -7,7 +7,8 @@
 # define BOOST_PYTHON_DETAIL_TYPE_TRAITS_HPP
 
 
-#if __cplusplus < 201103L
+#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>
@@ -34,7 +35,7 @@
 
 namespace boost { namespace python { namespace detail {
 
-#if __cplusplus < 201103L
+#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
     using boost::alignment_of;
     using boost::add_const;
     using boost::add_cv;
@@ -98,8 +99,8 @@ namespace boost { namespace python { namespace detail {
     using std::remove_cv;
     using std::remove_const;
 
-    using true_ = std::integral_constant<bool, true>;
-    using false_ = std::integral_constant<bool, false>;
+    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;
diff --git a/boost/python/detail/unwind_type.hpp b/boost/python/detail/unwind_type.hpp
index f6cdab64fe..f6cdab64fe 100755..100644
--- a/boost/python/detail/unwind_type.hpp
+++ b/boost/python/detail/unwind_type.hpp
diff --git a/boost/python/detail/unwrap_type_id.hpp b/boost/python/detail/unwrap_type_id.hpp
index 96c1f53013..96c1f53013 100755..100644
--- a/boost/python/detail/unwrap_type_id.hpp
+++ b/boost/python/detail/unwrap_type_id.hpp
diff --git a/boost/python/detail/unwrap_wrapper.hpp b/boost/python/detail/unwrap_wrapper.hpp
index 95bc233a72..95bc233a72 100755..100644
--- a/boost/python/detail/unwrap_wrapper.hpp
+++ b/boost/python/detail/unwrap_wrapper.hpp
diff --git a/boost/python/detail/value_arg.hpp b/boost/python/detail/value_arg.hpp
index 2c938dacca..2c938dacca 100755..100644
--- a/boost/python/detail/value_arg.hpp
+++ b/boost/python/detail/value_arg.hpp