diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-02 15:29:58 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-04 14:55:24 +0200 |
| commit | 4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05 (patch) | |
| tree | b9d3662dcb014831fd202864663cbb52a55ba476 /common | |
| parent | 65195513eb2676d974f1cef94be5e84f42a52f0f (diff) | |
| download | nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.tar.gz nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.tar.bz2 nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.zip | |
Progress on new wrapper system
Signed-off-by: David Shah <davey1576@gmail.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/pybindings.cc | 1 | ||||
| -rw-r--r-- | common/pywrappers.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/common/pybindings.cc b/common/pybindings.cc index e9ceca51..329bcf1e 100644 --- a/common/pybindings.cc +++ b/common/pybindings.cc @@ -123,7 +123,6 @@ BOOST_PYTHON_MODULE(MODULE_NAME) .def(self == self); arch_wrap_python(); - class_<Context, Context *, bases<Arch>, boost::noncopyable>("Context", no_init).def("checksum", &Context::checksum); } static wchar_t *program; diff --git a/common/pywrappers.h b/common/pywrappers.h index fe786a3b..5b0146ac 100644 --- a/common/pywrappers.h +++ b/common/pywrappers.h @@ -122,7 +122,9 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv, typename a static conv_result_type wrapped_fn(class_type &cls, conv_arg1_type arg1) { - return rv_conv()(get_base(cls).ctx, get_base(cls).*fn(arg1_conv()(get_ctx(cls), arg1))); + Context *ctx = get_ctx<Class>(cls); + Class &base = get_base<Class>(cls); + return rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1))); } template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); } |