Own changed to own
This commit is contained in:
parent
833169a47f
commit
92f874b3f2
|
@ -16,14 +16,14 @@ public:
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
StreamingIoPeer(
|
StreamingIoPeer(
|
||||||
Own<ConveyorFeeder<HeapMessageRoot<Incoming, InContainer>>> feed,
|
own<conveyorFeeder<HeapMessageRoot<Incoming, InContainer>>> feed,
|
||||||
Own<AsyncIoStream> stream, Codec codec, BufferT in, BufferT out);
|
own<AsyncIoStream> stream, Codec codec, BufferT in, BufferT out);
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
StreamingIoPeer(
|
StreamingIoPeer(
|
||||||
Own<ConveyorFeeder<HeapMessageRoot<Incoming, InContainer>>> feed,
|
own<conveyorFeeder<HeapMessageRoot<Incoming, InContainer>>> feed,
|
||||||
Own<AsyncIoStream> stream);
|
own<AsyncIoStream> stream);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deleted copy and move constructors
|
* Deleted copy and move constructors
|
||||||
|
@ -39,15 +39,15 @@ public:
|
||||||
/**
|
/**
|
||||||
* A phantom conveyor feeder. Meant for interfacing with other components
|
* A phantom conveyor feeder. Meant for interfacing with other components
|
||||||
*/
|
*/
|
||||||
ConveyorFeeder<HeapMessageRoot<Outgoing, OutContainer>> &feeder();
|
conveyorFeeder<HeapMessageRoot<Outgoing, OutContainer>> &feeder();
|
||||||
|
|
||||||
Conveyor<void> onReadDisconnected();
|
conveyor<void> onReadDisconnected();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class PeerConveyorFeeder final
|
class PeerconveyorFeeder final
|
||||||
: public ConveyorFeeder<HeapMessageRoot<Outgoing, OutContainer>> {
|
: public conveyorFeeder<HeapMessageRoot<Outgoing, OutContainer>> {
|
||||||
public:
|
public:
|
||||||
PeerConveyorFeeder(
|
PeerconveyorFeeder(
|
||||||
StreamingIoPeer<Codec, Incoming, Outgoing, InContainer,
|
StreamingIoPeer<Codec, Incoming, Outgoing, InContainer,
|
||||||
OutContainer, BufferT> &peer_)
|
OutContainer, BufferT> &peer_)
|
||||||
: peer{peer_} {}
|
: peer{peer_} {}
|
||||||
|
@ -66,20 +66,20 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Own<ConveyorFeeder<HeapMessageRoot<Incoming, InContainer>>>
|
own<conveyorFeeder<HeapMessageRoot<Incoming, InContainer>>>
|
||||||
incoming_feeder = nullptr;
|
incoming_feeder = nullptr;
|
||||||
|
|
||||||
Own<AsyncIoStream> io_stream;
|
own<AsyncIoStream> io_stream;
|
||||||
|
|
||||||
Codec codec;
|
Codec codec;
|
||||||
|
|
||||||
BufferT in_buffer;
|
BufferT in_buffer;
|
||||||
BufferT out_buffer;
|
BufferT out_buffer;
|
||||||
|
|
||||||
SinkConveyor sink_read;
|
sink_conveyor sink_read;
|
||||||
SinkConveyor sink_write;
|
sink_conveyor sink_write;
|
||||||
|
|
||||||
PeerConveyorFeeder conveyor_feeder;
|
PeerconveyorFeeder conveyor_feeder;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -90,10 +90,10 @@ template <typename Codec, typename Incoming, typename Outgoing,
|
||||||
typename InContainer = MessageContainer<Incoming>,
|
typename InContainer = MessageContainer<Incoming>,
|
||||||
typename OutContainer = MessageContainer<Outgoing>,
|
typename OutContainer = MessageContainer<Outgoing>,
|
||||||
typename BufferT = RingBuffer>
|
typename BufferT = RingBuffer>
|
||||||
std::pair<Own<StreamingIoPeer<Codec, Incoming, Outgoing, InContainer,
|
std::pair<own<StreamingIoPeer<Codec, Incoming, Outgoing, InContainer,
|
||||||
OutContainer, BufferT>>,
|
OutContainer, BufferT>>,
|
||||||
Conveyor<HeapMessageRoot<Incoming, InContainer>>>
|
conveyor<HeapMessageRoot<Incoming, InContainer>>>
|
||||||
newStreamingIoPeer(Own<AsyncIoStream> stream);
|
newStreamingIoPeer(own<AsyncIoStream> stream);
|
||||||
|
|
||||||
} // namespace saw
|
} // namespace saw
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue