Merge pull request #450 from dean0x7d/explicit-bool

Make operator bool() explicit
This commit is contained in:
Wenzel Jakob 2016-10-17 11:59:29 +02:00 committed by GitHub
commit 35995856dd

View File

@ -88,7 +88,7 @@ public:
const handle& dec_ref() const { Py_XDECREF(m_ptr); return *this; } const handle& dec_ref() const { Py_XDECREF(m_ptr); return *this; }
template <typename T> T cast() const; template <typename T> T cast() const;
operator bool() const { return m_ptr != nullptr; } explicit operator bool() const { return m_ptr != nullptr; }
bool operator==(const handle &h) const { return m_ptr == h.m_ptr; } bool operator==(const handle &h) const { return m_ptr == h.m_ptr; }
bool operator!=(const handle &h) const { return m_ptr != h.m_ptr; } bool operator!=(const handle &h) const { return m_ptr != h.m_ptr; }
bool check() const { return m_ptr != nullptr; } bool check() const { return m_ptr != nullptr; }
@ -572,7 +572,7 @@ public:
class bool_ : public object { class bool_ : public object {
public: public:
PYBIND11_OBJECT_DEFAULT(bool_, object, PyBool_Check) PYBIND11_OBJECT_DEFAULT(bool_, object, PyBool_Check)
// Allow implicit conversion from `bool`: // Allow implicit conversion from and to `bool`:
bool_(bool value) : object(value ? Py_True : Py_False, true) { } bool_(bool value) : object(value ? Py_True : Py_False, true) { }
operator bool() const { return m_ptr && PyLong_AsLong(m_ptr) != 0; } operator bool() const { return m_ptr && PyLong_AsLong(m_ptr) != 0; }
}; };