diff options
author | Miodrag Milanović <mmicko@gmail.com> | 2020-09-14 15:57:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-14 15:57:29 +0200 |
commit | f7da7c26aa117f0186d24b4809690f06e7121eae (patch) | |
tree | 0bece8ab250147a8a03d7490f331f3e654c212d4 /common | |
parent | 48cd40773abb43adf8fa954c7483dc15c492be84 (diff) | |
parent | b5e5f8d85f7c65bcd8c824000f2f6c3c5210ab4d (diff) | |
download | nextpnr-f7da7c26aa117f0186d24b4809690f06e7121eae.tar.gz nextpnr-f7da7c26aa117f0186d24b4809690f06e7121eae.tar.bz2 nextpnr-f7da7c26aa117f0186d24b4809690f06e7121eae.zip |
Merge pull request #500 from YosysHQ/dave/py-none-fix
python: Fix handling of None in pybind11
Diffstat (limited to 'common')
-rw-r--r-- | common/pywrappers.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/pywrappers.h b/common/pywrappers.h index a864d8cf..d7e65e50 100644 --- a/common/pywrappers.h +++ b/common/pywrappers.h @@ -156,7 +156,7 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv> struct fn_ try { return py::cast(rv_conv()(ctx, (base.*fn)())); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } @@ -177,7 +177,7 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv, typename a try { return py::cast(rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1)))); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } @@ -200,7 +200,7 @@ struct fn_wrapper_2a try { return py::cast(rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2)))); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } @@ -226,7 +226,7 @@ struct fn_wrapper_3a return py::cast( rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2), arg3_conv()(ctx, arg3)))); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } @@ -415,7 +415,7 @@ template <typename Class, typename MemT, MemT mem, typename v_conv> struct reado try { return py::cast(v_conv()(ctx, (base.*mem))); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } @@ -438,7 +438,7 @@ template <typename Class, typename MemT, MemT mem, typename get_conv, typename s try { return py::cast(get_conv()(ctx, (base.*mem))); } catch (bad_wrap &) { - return py::object(); + return py::none(); } } |