boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-19 04:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Stefan Seefeld
2017-11-17 10:06:54 -05:00
parent fc978f085b b9d0d97499
commit 7c33ff0c59
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/python/detail/type_traits.hpp
View File

@@ -7,8 +7,8 @@
# define BOOST_PYTHON_DETAIL_TYPE_TRAITS_HPP
#if __cplusplus < 201103L && (!defined(BOOST_MSVC) || BOOST_MSVC<=1600)
#define BOOST_PYTHON_USE_BOOST_TYPES
#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>
@@ -35,7 +35,7 @@
namespace boost { namespace python { namespace detail {
#if defined(BOOST_PYTHON_USE_BOOST_TYPES)
#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
using boost::alignment_of;
using boost::add_const;
using boost::add_cv;
@@ -99,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;