From 3271fecfdee7ae728cedf3316500d7d69f23e100 Mon Sep 17 00:00:00 2001 From: Baljak Date: Wed, 23 Aug 2017 00:45:30 +0200 Subject: [PATCH] Fix is_template_base_of on VS with LLVM/Intel toolset (#1020) --- include/pybind11/detail/common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h index c831ae3cc..6c914db2e 100644 --- a/include/pybind11/detail/common.h +++ b/include/pybind11/detail/common.h @@ -659,9 +659,9 @@ struct is_template_base_of_impl { /// `is_template_base_of` is true if `struct T : Base {}` where U can be anything template class Base, typename T> #if !defined(_MSC_VER) -using is_template_base_of = decltype(is_template_base_of_impl::check((remove_cv_t*)nullptr)); +using is_template_base_of = decltype(is_template_base_of_impl::check((intrinsic_t*)nullptr)); #else // MSVC2015 has trouble with decltype in template aliases -struct is_template_base_of : decltype(is_template_base_of_impl::check((remove_cv_t*)nullptr)) { }; +struct is_template_base_of : decltype(is_template_base_of_impl::check((intrinsic_t*)nullptr)) { }; #endif /// Check if T is an instantiation of the template `Class`. For example: