refactor: simpler Intel workaround, suggested by @laramiel

Author: henryiii

include/pybind11/stl_bind.h

@@ -375,18 +375,18 @@ struct vector_has_data_and_format : std::false_type {};
 template <typename Vector>
 struct vector_has_data_and_format<Vector, enable_if_t<std::is_same<decltype(format_descriptor<typename Vector::value_type>::format(), std::declval<Vector>().data()), typename Vector::value_type*>::value>> : std::true_type {};
 
-// Add the buffer interface to a vector
-template <typename Vector, typename Class_, typename... Args>
-#if defined(__INTEL_COMPILER) && defined(PYBIND11_CPP17)
 // [workaround(intel)] Separate function required here
 // Workaround as the Intel compiler does not compile the enable_if_t part below
 // (tested with icc (ICC) 2021.1 Beta 20200827)
-void vector_buffer(Class_& cl) {
-  if constexpr (detail::any_of<std::is_same<Args, buffer_protocol>...>::value) {
-#else
-enable_if_t<detail::any_of<std::is_same<Args, buffer_protocol>...>::value>
+template <typename... Args>
+constexpr bool args_any_are_buffer() {
+    return detail::any_of<std::is_same<Args, buffer_protocol>...>::value;
+}
+
+// Add the buffer interface to a vector
+template <typename Vector, typename Class_, typename... Args>
+enable_if_t<args_any_are_buffer<Args...>()>
 vector_buffer(Class_& cl) {
-#endif
     using T = typename Vector::value_type;
 
     static_assert(vector_has_data_and_format<Vector>::value, "There is not an appropriate format descriptor for this vector");
@@ -421,16 +421,11 @@ vector_buffer(Class_& cl) {
     }));
 
     return;
-#if defined(__INTEL_COMPILER) && defined(PYBIND11_CPP17)
-  }
-}
-#else
 }
 
 template <typename Vector, typename Class_, typename... Args>
-enable_if_t<!detail::any_of<std::is_same<Args, buffer_protocol>...>::value> vector_buffer(Class_&) {}
+enable_if_t<!args_any_are_buffer<Args...>()> vector_buffer(Class_&) {}
 
-#endif
 
 PYBIND11_NAMESPACE_END(detail)
 

tests/test_constants_and_functions.cpp

@@ -46,7 +46,7 @@ std::string print_bytes(py::bytes bytes) {
 // Test that we properly handle C++17 exception specifiers (which are part of the function signature
 // in C++17).  These should all still work before C++17, but don't affect the function signature.
 namespace test_exc_sp {
-// // [workaround(intel)] Unable to use noexcept instead of noexcept(true)
+// [workaround(intel)] Unable to use noexcept instead of noexcept(true)
 // Make the f1 test basically the same as the f2 test in C++17 mode for the Intel compiler as
 // it fails to compile with a plain noexcept (tested with icc (ICC) 2021.1 Beta 20200827).
 #if defined(__INTEL_COMPILER) && defined(PYBIND11_CPP17)