diff options
| author | Ryan Keane <rwkeane@google.com> | 2020-03-10 13:27:52 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-11 01:00:59 +0000 |
| commit | cbf7f5178da67099ecc2ead3a88101188a3292f0 (patch) | |
| tree | 7247a0b25675696afd6b9e6558758dca1a8ba52c /osp | |
| parent | 1bdc5980b3a43ad053849a82d2962cb7f66ed7e3 (diff) | |
| download | openscreen-cbf7f5178da67099ecc2ead3a88101188a3292f0.tar.gz | |
Platform: Add Operator < to IPAddress
Requested follow up to CL:
https://chromium-review.googlesource.com/c/openscreen/+/2076692
Change-Id: I3247f82298c56a7ba836faa80bb369d20e0357be
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2094872
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Commit-Queue: Ryan Keane <rwkeane@google.com>
Diffstat (limited to 'osp')
| -rw-r--r-- | osp/impl/quic/quic_client.h | 5 | ||||
| -rw-r--r-- | osp/impl/quic/quic_connection_factory_impl.h | 2 | ||||
| -rw-r--r-- | osp/impl/quic/quic_server.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/osp/impl/quic/quic_client.h b/osp/impl/quic/quic_client.h index 7e37267d..548cbff5 100644 --- a/osp/impl/quic/quic_client.h +++ b/osp/impl/quic/quic_client.h @@ -103,7 +103,7 @@ class QuicClient final : public ProtocolConnectionClient, // Maps an IPEndpoint to a generated endpoint ID. This is used to insulate // callers from post-handshake changes to a connections actual peer endpoint. - std::map<IPEndpoint, uint64_t, IPEndpointComparator> endpoint_map_; + std::map<IPEndpoint, uint64_t> endpoint_map_; // Value that will be used for the next new endpoint in a Connect call. uint64_t next_endpoint_id_ = 0; @@ -119,8 +119,7 @@ class QuicClient final : public ProtocolConnectionClient, // Maps endpoint addresses to data about connections that haven't successfully // completed the QUIC handshake. - std::map<IPEndpoint, PendingConnectionData, IPEndpointComparator> - pending_connections_; + std::map<IPEndpoint, PendingConnectionData> pending_connections_; // Maps endpoint IDs to data about connections that have successfully // completed the QUIC handshake. diff --git a/osp/impl/quic/quic_connection_factory_impl.h b/osp/impl/quic/quic_connection_factory_impl.h index 0bfa242f..e3588f6a 100644 --- a/osp/impl/quic/quic_connection_factory_impl.h +++ b/osp/impl/quic/quic_connection_factory_impl.h @@ -53,7 +53,7 @@ class QuicConnectionFactoryImpl final : public QuicConnectionFactory { QuicConnection* connection; UdpSocket* socket; // References one of the owned |sockets_|. }; - std::map<IPEndpoint, OpenConnection, IPEndpointComparator> connections_; + std::map<IPEndpoint, OpenConnection> connections_; // NOTE: Must be provided in constructor and stored as an instance variable // rather than using the static accessor method to allow for UTs to mock this diff --git a/osp/impl/quic/quic_server.h b/osp/impl/quic/quic_server.h index 31a3bbe8..ad195635 100644 --- a/osp/impl/quic/quic_server.h +++ b/osp/impl/quic/quic_server.h @@ -84,15 +84,14 @@ class QuicServer final : public ProtocolConnectionServer, // Maps an IPEndpoint to a generated endpoint ID. This is used to insulate // callers from post-handshake changes to a connections actual peer endpoint. - std::map<IPEndpoint, uint64_t, IPEndpointComparator> endpoint_map_; + std::map<IPEndpoint, uint64_t> endpoint_map_; // Value that will be used for the next new endpoint in a Connect call. uint64_t next_endpoint_id_ = 0; // Maps endpoint addresses to data about connections that haven't successfully // completed the QUIC handshake. - std::map<IPEndpoint, ServiceConnectionData, IPEndpointComparator> - pending_connections_; + std::map<IPEndpoint, ServiceConnectionData> pending_connections_; // Maps endpoint IDs to data about connections that have successfully // completed the QUIC handshake. |