Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 15:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make is_template_base_of ignore cv qualification

Browse Source 
`is_template_base_of<T>` fails when `T` is `const` (because its
implementation relies on being able to convert a `T*` to a `Base<U>*`,
which won't work when `T` is const).

(This also agrees with std::is_base_of, which ignores cv qualification.)
This commit is contained in:
Jason Rhinelander 2017-01-14 11:25:28 -05:00 committed by Wenzel Jakob
parent d9d224f288
commit 7d46c6f60d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pybind11/common.h
View File

@ -378,9 +378,11 @@ inline internals &get_internals();
#ifdef PYBIND11_CPP14 #ifdef PYBIND11_CPP14
using std::enable_if_t; using std::enable_if_t;
using std::conditional_t; using std::conditional_t;
using std::remove_cv_t;
#else #else
template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type; template <bool B, typename T = void> using enable_if_t = typename std::enable_if<B, T>::type;
template <bool B, typename T, typename F> using conditional_t = typename std::conditional<B, T, F>::type; template <bool B, typename T, typename F> using conditional_t = typename std::conditional<B, T, F>::type;
template <typename T> using remove_cv_t = typename std::remove_cv<T>::type;
#endif #endif
/// Index sequences /// Index sequences
@ -499,9 +501,9 @@ struct is_template_base_of_impl {
/// `is_template_base_of<Base, T>` is true if `struct T : Base<U> {}` where U can be anything /// `is_template_base_of<Base, T>` is true if `struct T : Base<U> {}` where U can be anything
template <template<typename...> class Base, typename T> template <template<typename...> class Base, typename T>
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
using is_template_base_of = decltype(is_template_base_of_impl<Base>::check((T*)nullptr)); using is_template_base_of = decltype(is_template_base_of_impl<Base>::check((remove_cv_t<T>*)nullptr));
#else // MSVC2015 has trouble with decltype in template aliases #else // MSVC2015 has trouble with decltype in template aliases
struct is_template_base_of : decltype(is_template_base_of_impl<Base>::check((T*)nullptr)) { }; struct is_template_base_of : decltype(is_template_base_of_impl<Base>::check((remove_cv_t<T>*)nullptr)) { };
#endif #endif
/// Check if T is std::shared_ptr<U> where U can be anything /// Check if T is std::shared_ptr<U> where U can be anything