aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shah <davey1576@gmail.com>2018-06-26 14:21:54 +0200
committerDavid Shah <davey1576@gmail.com>2018-06-26 14:21:54 +0200
commit962c566ffb6aa37ea1eb2e3bd8355feb73308ca4 (patch)
tree0269c37fd8a9de3775cbabaa1a0dc15fbc75a326
parent103dde79de25e2f9250b27134aa3d547d42408e2 (diff)
downloadnextpnr-962c566ffb6aa37ea1eb2e3bd8355feb73308ca4.tar.gz
nextpnr-962c566ffb6aa37ea1eb2e3bd8355feb73308ca4.tar.bz2
nextpnr-962c566ffb6aa37ea1eb2e3bd8355feb73308ca4.zip
Fixing Python bindings bugs
Signed-off-by: David Shah <davey1576@gmail.com>
-rw-r--r--common/pybindings.cc4
-rw-r--r--common/pycontainers.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/pybindings.cc b/common/pybindings.cc
index 83043da1..13e0976c 100644
--- a/common/pybindings.cc
+++ b/common/pybindings.cc
@@ -96,7 +96,7 @@ BOOST_PYTHON_MODULE(MODULE_NAME)
.def_readwrite("net", &PortInfo::net)
.def_readwrite("type", &PortInfo::type);
- class_<CellInfo, CellInfo *, boost::noncopyable>("CellInfo")
+ class_<CellInfo, CellInfo *>("CellInfo")
.def_readwrite("name", &CellInfo::name)
.def_readwrite("type", &CellInfo::type)
.def_readwrite("ports", &CellInfo::ports)
@@ -110,7 +110,7 @@ BOOST_PYTHON_MODULE(MODULE_NAME)
class_<BaseCtx, BaseCtx *, boost::noncopyable>("BaseCtx", no_init)
.add_property("nets", make_getter(&Context::nets, return_internal_reference<>()))
- .add_property("cells", make_getter(&Context::nets, return_internal_reference<>()));
+ .add_property("cells", make_getter(&Context::cells, return_internal_reference<>()));
WRAP_MAP_UPTR(decltype(Context::nets), "IdNetMap");
WRAP_MAP_UPTR(decltype(Context::cells), "IdCellMap");
diff --git a/common/pycontainers.h b/common/pycontainers.h
index 01145ea7..917f49e9 100644
--- a/common/pycontainers.h
+++ b/common/pycontainers.h
@@ -341,7 +341,7 @@ template <typename T> struct map_wrapper_uptr
static void wrap(const char *map_name, const char *kv_name, const char *kv_iter_name, const char *iter_name)
{
map_pair_wrapper_uptr<typename KV::first_type, typename KV::second_type>::wrap(kv_name, kv_iter_name);
- typedef range_wrapper<T, return_value_policy<copy_non_const_reference>> rw;
+ typedef range_wrapper<T, return_internal_reference<>> rw;
typename rw::iter_wrap().wrap(iter_name);
class_<T, boost::noncopyable>(map_name, no_init)
.def("__iter__", rw::iter)