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

Removing MSVC C4800 from pragma block at the top of pybind11.h (#3141)

Browse Source 
* Adding PYBIND11_COMPAT_BOOL_CAST to appease MSVC 2015 warning C4800.

* Replacing PYBIND11_COMPAT_BOOL_CAST with simpler != 0

* Extra parentheses (almost all compilers failed without these).
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-07-26 13:26:36 -07:00 committed by Henry Schreiner
parent c973660d6c
commit e93d94594b
No known key found for this signature in database
GPG Key ID: B9D0E45146A241E8
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/buffer_info.h
View File

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

2
include/pybind11/cast.h
View File

@ -322,7 +322,7 @@ public:
} }
#endif #endif
if (res == 0 || res == 1) { if (res == 0 || res == 1) {
value = (bool) res; value = (res != 0);
return true; return true;
} }
PyErr_Clear(); PyErr_Clear();

4
include/pybind11/detail/type_caster_base.h
View File

@ -231,7 +231,7 @@ struct value_and_holder {
return reinterpret_cast<V *&>(vh[0]); return reinterpret_cast<V *&>(vh[0]);
} }
// True if this `value_and_holder` has a non-null value pointer // True if this `value_and_holder` has a non-null value pointer
explicit operator bool() const { return value_ptr(); } explicit operator bool() const { return value_ptr() != nullptr; }
template <typename H> H &holder() const { template <typename H> H &holder() const {
return reinterpret_cast<H &>(vh[1]); return reinterpret_cast<H &>(vh[1]);
@ -252,7 +252,7 @@ struct value_and_holder {
bool instance_registered() const { bool instance_registered() const {
return inst->simple_layout return inst->simple_layout
? inst->simple_instance_registered ? inst->simple_instance_registered
: 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 { void set_instance_registered(bool v = true) const {
if (inst->simple_layout) if (inst->simple_layout)

1
include/pybind11/pybind11.h
View File

@ -18,7 +18,6 @@
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter # pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
# pragma warning(disable: 4127) // warning C4127: Conditional expression is constant # pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
# pragma warning(disable: 4800) // warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
# pragma warning(disable: 4505) // warning C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only) # pragma warning(disable: 4505) // warning C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
#elif defined(__GNUG__) && !defined(__clang__) #elif defined(__GNUG__) && !defined(__clang__)
# pragma GCC diagnostic push # pragma GCC diagnostic push

6
include/pybind11/pytypes.h
View File

@ -367,7 +367,9 @@ public:
/// Check if the currently trapped error type matches the given Python exception class (or a /// Check if the currently trapped error type matches the given Python exception class (or a
/// subclass thereof). May also be passed a tuple to search for any exception class matches in /// subclass thereof). May also be passed a tuple to search for any exception class matches in
/// the given tuple. /// the given tuple.
bool matches(handle exc) const { return PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()); } bool matches(handle exc) const {
return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
}
const object& type() const { return m_type; } const object& type() const { return m_type; }
const object& value() const { return m_value; } const object& value() const { return m_value; }
@ -853,7 +855,7 @@ PYBIND11_NAMESPACE_END(detail)
Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) { } \ Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) { } \
Name(handle h, stolen_t) : Parent(h, stolen_t{}) { } \ Name(handle h, stolen_t) : Parent(h, stolen_t{}) { } \
PYBIND11_DEPRECATED("Use py::isinstance<py::python_type>(obj) instead") \ PYBIND11_DEPRECATED("Use py::isinstance<py::python_type>(obj) instead") \
bool check() const { return m_ptr != nullptr && (bool) 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()); } \ static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); } \
template <typename Policy_> \ template <typename Policy_> \
Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) { } Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) { }