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

fix crash when None is passed to enum::operator==

Browse Source
This commit is contained in:
Wenzel Jakob 2016-05-01 12:45:38 +02:00
parent 9059bd8134
commit 6fb48490ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/pybind11/pybind11.h
View File

@ -409,7 +409,6 @@ protected:
} }
} }
} }
if (kwargs_consumed == nkwargs) if (kwargs_consumed == nkwargs)
result = it->impl(it, args_, parent); result = it->impl(it, args_, parent);
@ -937,10 +936,11 @@ public:
((it == entries->end()) ? std::string("???") ((it == entries->end()) ? std::string("???")
: std::string(it->second)); : std::string(it->second));
}); });
this->def("__init__", [](Type& value, int i) { value = (Type) i; }); this->def("__init__", [](Type& value, int i) { value = (Type)i; });
this->def("__init__", [](Type& value, int i) { new (&value) Type((Type) i); });
this->def("__int__", [](Type value) { return (int) value; }); this->def("__int__", [](Type value) { return (int) value; });
this->def("__eq__", [](const Type &value, Type value2) { return value == value2; }); this->def("__eq__", [](const Type &value, Type *value2) { return value2 && value == *value2; });
this->def("__ne__", [](const Type &value, Type value2) { return value != value2; }); this->def("__ne__", [](const Type &value, Type *value2) { return !value2 || value != *value2; });
this->def("__hash__", [](const Type &value) { return (int) value; }); this->def("__hash__", [](const Type &value) { return (int) value; });
m_entries = entries; m_entries = entries;
} }