diff options
| author | btolsch <btolsch@chromium.org> | 2020-02-12 16:48:48 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-13 01:23:35 +0000 |
| commit | 3c647c95611343018ce4574ef8a3b3d2ec0f088a (patch) | |
| tree | 98fef1a1dde8caeadba495a030457448da971eec /cast/sender | |
| parent | b0b4bb3063d8b1d161167f183fdeb538acba48b7 (diff) | |
| download | openscreen-3c647c95611343018ce4574ef8a3b3d2ec0f088a.tar.gz | |
Change CastSocket to use signed ID
This change aligns CastSocket both with the style guide recommendation
to prefer signed integers and to the Chrome CastSocket implementation,
which will make it easier to integrate into Chrome.
Bug: openscreen:59
Change-Id: If22691c41d46d1baa8350b402f8f3b3450cb7c32
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2051212
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Reviewed-by: Ryan Keane <rwkeane@google.com>
Diffstat (limited to 'cast/sender')
| -rw-r--r-- | cast/sender/channel/sender_socket_factory.cc | 4 | ||||
| -rw-r--r-- | cast/sender/channel/sender_socket_factory.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cast/sender/channel/sender_socket_factory.cc b/cast/sender/channel/sender_socket_factory.cc index 8dff73c4..6f8d9a51 100644 --- a/cast/sender/channel/sender_socket_factory.cc +++ b/cast/sender/channel/sender_socket_factory.cc @@ -16,11 +16,11 @@ namespace openscreen { namespace cast { bool operator<(const std::unique_ptr<SenderSocketFactory::PendingAuth>& a, - uint32_t b) { + int32_t b) { return a && a->socket->socket_id() < b; } -bool operator<(uint32_t a, +bool operator<(int32_t a, const std::unique_ptr<SenderSocketFactory::PendingAuth>& b) { return b && a < b->socket->socket_id(); } diff --git a/cast/sender/channel/sender_socket_factory.h b/cast/sender/channel/sender_socket_factory.h index 9cb31066..094530dd 100644 --- a/cast/sender/channel/sender_socket_factory.h +++ b/cast/sender/channel/sender_socket_factory.h @@ -79,8 +79,8 @@ class SenderSocketFactory final : public TlsConnectionFactory::Client, bssl::UniquePtr<X509> peer_cert; }; - friend bool operator<(const std::unique_ptr<PendingAuth>& a, uint32_t b); - friend bool operator<(uint32_t a, const std::unique_ptr<PendingAuth>& b); + friend bool operator<(const std::unique_ptr<PendingAuth>& a, int32_t b); + friend bool operator<(int32_t a, const std::unique_ptr<PendingAuth>& b); std::vector<PendingConnection>::iterator FindPendingConnection( const IPEndpoint& endpoint); |