Replacing PYBIND11_COMPAT_BOOL_CAST with simpler != 0

Author: rwgk

include/pybind11/buffer_info.h

@@ -83,7 +83,7 @@ struct buffer_info {
             view->strides
             ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
             : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
-            PYBIND11_COMPAT_BOOL_CAST(view->readonly)) {
+            (view->readonly != 0)) {
         this->m_view = view;
         this->ownview = ownview;
     }

include/pybind11/cast.h

@@ -322,7 +322,7 @@ template <> class type_caster<bool> {
             }
             #endif
             if (res == 0 || res == 1) {
-                value = PYBIND11_COMPAT_BOOL_CAST(res);
+                value = (res != 0);
                 return true;
             }
             PyErr_Clear();

include/pybind11/detail/common.h

@@ -265,10 +265,6 @@ extern "C" {
 #define PYBIND11_ENSURE_INTERNALS_READY \
     pybind11::detail::get_internals();
 
-// Paying tribute to MSVC 2015 warning
-// C4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
-#define PYBIND11_COMPAT_BOOL_CAST(...) ((__VA_ARGS__) ? true : false)
-
 #define PYBIND11_CHECK_PYTHON_VERSION \
     {                                                                          \
         const char *compiled_ver = PYBIND11_TOSTRING(PY_MAJOR_VERSION)         \

include/pybind11/detail/type_caster_base.h

@@ -252,8 +252,7 @@ struct value_and_holder {
     bool instance_registered() const {
         return inst->simple_layout
             ? inst->simple_instance_registered
-            : PYBIND11_COMPAT_BOOL_CAST(
-                  inst->nonsimple.status[index] & instance::status_instance_registered);
+            : (inst->nonsimple.status[index] & instance::status_instance_registered != 0);
     }
     void set_instance_registered(bool v = true) const {
         if (inst->simple_layout)

include/pybind11/pytypes.h

@@ -368,7 +368,7 @@ class PYBIND11_EXPORT error_already_set : public std::runtime_error {
     /// subclass thereof).  May also be passed a tuple to search for any exception class matches in
     /// the given tuple.
     bool matches(handle exc) const {
-        return PYBIND11_COMPAT_BOOL_CAST(PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()));
+        return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
     }
 
     const object& type() const { return m_type; }
@@ -855,7 +855,7 @@ PYBIND11_NAMESPACE_END(detail)
         Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) { } \
         Name(handle h, stolen_t) : Parent(h, stolen_t{}) { } \
         PYBIND11_DEPRECATED("Use py::isinstance<py::python_type>(obj) instead") \
-        bool check() const { return m_ptr != nullptr && PYBIND11_COMPAT_BOOL_CAST(CheckFun(m_ptr)); } \
+        bool check() const { return m_ptr != nullptr && (CheckFun(m_ptr) != 0); } \
         static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); } \
         template <typename Policy_> \
         Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) { }