Skip to content

Commit

Permalink
Tweaks in response to reviews.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralf W. Grosse-Kunstleve committed Feb 14, 2022
1 parent f072f4a commit cff378c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ error is raised if the compiler does not meet the requirements:

* GCC >= 4.8
* clang >= 3.3 (appleclang >= 5.0)
* MSVC >= 2017
* MSVC >= 2015u3
* Intel C++ >= 15.0


Expand Down
4 changes: 1 addition & 3 deletions include/pybind11/detail/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,7 @@ struct is_template_base_of_impl {
/// Check if a template is the base of a type. For example:
/// `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>
#if defined(PYBIND11_CPP20) || !defined(_MSC_VER) \
|| _MSC_VER > 1930 /* Increment as needed, let MS know please. */
// https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
#if defined(PYBIND11_CPP20) || !defined(_MSC_VER) // Sadly, all MSVC versions incl. 2022 need this.
using is_template_base_of
= decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T> *) nullptr));
#else
Expand Down

0 comments on commit cff378c

Please sign in to comment.