IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix after API changes. Should now be ready for 0.4 RC

Browse Source
This commit is contained in:
Jason Paryani
2013-12-06 13:19:30 -08:00
parent 90bf090db1
commit 6432e768c3
5 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
capnp/rpcHelper.h
View File

@@ -9,7 +9,7 @@ extern "C" {
capnp::Capability::Client * call_py_restorer(PyObject *, capnp::DynamicStruct::Reader &);
}
class PyRestorer final: public capnp::SturdyRefRestorer<capnp::ObjectPointer> {
class PyRestorer final: public capnp::SturdyRefRestorer<capnp::AnyPointer> {
public:
PyRestorer(PyObject * _py_restorer, capnp::StructSchema& _schema): py_restorer(_py_restorer), schema(_schema) {
// We don't need to incref/decref, since this C++ class will be owned by the Python wrapper class, and we'll make sure the python class doesn't refcount to 0 elsewhere.
@@ -20,7 +20,7 @@ public:
// Py_DECREF(py_restorer);
// }
capnp::Capability::Client restore(capnp::ObjectPointer::Reader objectId) override {
capnp::Capability::Client restore(capnp::AnyPointer::Reader objectId) override {
auto reader = objectId.getAs<capnp::DynamicStruct>(schema);
capnp::Capability::Client * ret = call_py_restorer(py_restorer, reader);
check_py_error();
@@ -38,14 +38,14 @@ private:
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::MessageBuilder & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
return client.restore(hostId, objectId.getRoot<capnp::ObjectPointer>());
return client.restore(hostId, objectId.getRoot<capnp::AnyPointer>());
}
capnp::Capability::Client restoreHelper(capnp::RpcSystem<capnp::rpc::twoparty::SturdyRefHostId>& client, capnp::MessageReader & objectId) { capnp::MallocMessageBuilder hostIdMessage(8);
auto hostId = hostIdMessage.initRoot<capnp::rpc::twoparty::SturdyRefHostId>();
hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
return client.restore(hostId, objectId.getRoot<capnp::ObjectPointer>());
return client.restore(hostId, objectId.getRoot<capnp::AnyPointer>());
}
template <typename SturdyRefHostId, typename ProvisionId,
@@ -55,5 +55,5 @@ capnp::RpcSystem<SturdyRefHostId> makeRpcClientWithRestorer(
PyRestorer& restorer) {
using namespace capnp;
return RpcSystem<SturdyRefHostId>(network,
kj::Maybe<SturdyRefRestorer<ObjectPointer>&>(restorer));
kj::Maybe<SturdyRefRestorer<AnyPointer>&>(restorer));
}