diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-06-21 06:56:35 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-06-21 06:56:35 +0000 |
| commit | 0ce494cad47efd21148ddbddb41e96ef9867fcc6 (patch) | |
| tree | 21a5073f7415e5c762bab6c2d6005778b84e8e0f /cppe/src | |
| parent | Added one-shot constructors to icej and iceje. (diff) | |
| download | ice-0ce494cad47efd21148ddbddb41e96ef9867fcc6.tar.bz2 ice-0ce494cad47efd21148ddbddb41e96ef9867fcc6.tar.xz ice-0ce494cad47efd21148ddbddb41e96ef9867fcc6.zip | |
Split communicator into server/client. Communicator no longer is slice
generated. Split Instance into server/client. Split ConnectionFactory
into Incoming & Outgoing. Connection is no longer slice generated.
Connection is split into client/server
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/TcpTransport/Endpoint.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/cppe/src/TcpTransport/Endpoint.cpp b/cppe/src/TcpTransport/Endpoint.cpp index dc02bf4a9a0..b6067b94764 100644 --- a/cppe/src/TcpTransport/Endpoint.cpp +++ b/cppe/src/TcpTransport/Endpoint.cpp @@ -211,19 +211,6 @@ IceInternal::Endpoint::unknown() const return false; } -TransceiverPtr -IceInternal::Endpoint::clientTransceiver() const -{ - return 0; -} - -TransceiverPtr -IceInternal::Endpoint::serverTransceiver(EndpointPtr& endp) const -{ - endp = const_cast<Endpoint*>(this); - return 0; -} - ConnectorPtr IceInternal::Endpoint::connector() const { @@ -247,22 +234,14 @@ IceInternal::Endpoint::equivalent(const TransceiverPtr&) const bool IceInternal::Endpoint::equivalent(const AcceptorPtr& acceptor) const { - const Acceptor* tcpAcceptor = dynamic_cast<const Acceptor*>(acceptor.get()); - if(!tcpAcceptor) - { - return false; - } - return tcpAcceptor->equivalent(_host, _port); + return acceptor->equivalent(_host, _port); } bool IceInternal::Endpoint::operator==(const Endpoint& r) const { const Endpoint* p = dynamic_cast<const Endpoint*>(&r); - if(!p) - { - return false; - } + assert(p); if(this == p) { @@ -312,10 +291,7 @@ bool IceInternal::Endpoint::operator<(const Endpoint& r) const { const Endpoint* p = dynamic_cast<const Endpoint*>(&r); - if(!p) - { - return type() < r.type(); - } + assert(p); if(this == p) { |