Commit 4e178217 authored by Gordon McShane's avatar Gordon McShane Committed by Harris Hancock

Enable excluded code now required by lite-mode

parent fab81527
...@@ -252,7 +252,6 @@ public: ...@@ -252,7 +252,6 @@ public:
// portion of each segment, whereas tryGetSegment() returns something that includes // portion of each segment, whereas tryGetSegment() returns something that includes
// not-yet-allocated space. // not-yet-allocated space.
#if !CAPNP_LITE
inline CapTableBuilder* getLocalCapTable() { inline CapTableBuilder* getLocalCapTable() {
// Return a CapTableBuilder that merely implements local loopback. That is, you can set // Return a CapTableBuilder that merely implements local loopback. That is, you can set
// capabilities, then read the same capabilities back, but there is no intent ever to transmit // capabilities, then read the same capabilities back, but there is no intent ever to transmit
...@@ -269,7 +268,6 @@ public: ...@@ -269,7 +268,6 @@ public:
return &localCapTable; return &localCapTable;
} }
#endif // !CAPNP_LITE
SegmentBuilder* getSegment(SegmentId id); SegmentBuilder* getSegment(SegmentId id);
// Get the segment with the given id. Crashes or throws an exception if no such segment exists. // Get the segment with the given id. Crashes or throws an exception if no such segment exists.
...@@ -304,8 +302,8 @@ private: ...@@ -304,8 +302,8 @@ private:
MessageBuilder* message; MessageBuilder* message;
ReadLimiter dummyLimiter; ReadLimiter dummyLimiter;
#if !CAPNP_LITE
class LocalCapTable: public CapTableBuilder { class LocalCapTable: public CapTableBuilder {
#if !CAPNP_LITE
public: public:
kj::Maybe<kj::Own<ClientHook>> extractCap(uint index) override; kj::Maybe<kj::Own<ClientHook>> extractCap(uint index) override;
uint injectCap(kj::Own<ClientHook>&& cap) override; uint injectCap(kj::Own<ClientHook>&& cap) override;
...@@ -313,10 +311,10 @@ private: ...@@ -313,10 +311,10 @@ private:
private: private:
kj::Vector<kj::Maybe<kj::Own<ClientHook>>> capTable; kj::Vector<kj::Maybe<kj::Own<ClientHook>>> capTable;
#endif // ! CAPNP_LITE
}; };
LocalCapTable localCapTable; LocalCapTable localCapTable;
#endif // !CAPNP_LITE
SegmentBuilder segment0; SegmentBuilder segment0;
kj::ArrayPtr<const word> segment0ForOutput; kj::ArrayPtr<const word> segment0ForOutput;
......
...@@ -36,9 +36,11 @@ namespace { ...@@ -36,9 +36,11 @@ namespace {
class DummyCapTableReader: public _::CapTableReader { class DummyCapTableReader: public _::CapTableReader {
public: public:
#if !CAPNP_LITE
kj::Maybe<kj::Own<ClientHook>> extractCap(uint index) override { kj::Maybe<kj::Own<ClientHook>> extractCap(uint index) override {
return nullptr; return nullptr;
} }
#endif
}; };
static constexpr DummyCapTableReader dummyCapTableReader = DummyCapTableReader(); static constexpr DummyCapTableReader dummyCapTableReader = DummyCapTableReader();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment