aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormark a. foltz <mfoltz@chromium.org>2019-10-07 11:14:26 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-08 17:11:38 +0000
commit64b3c16c84f34f59d90d3cff21bac72cf40d9ce1 (patch)
treec8e48b73852e14afbbce27e9e944c8023286c037
parentecca5d148a59121159b8fb436a9b0b47fd2b79ad (diff)
downloadopenscreen-64b3c16c84f34f59d90d3cff21bac72cf40d9ce1.tar.gz
Fix gcc compilation error.
GCC compilation is failing with an error related to returning a variable allocated on the stack. However this error does not seem to be reproducing in the current buildbot. This does look like a legitimate compilation error, so sending a patch anyway. Bug: openscreen:40 Change-Id: Ida7c91844795e700656a2eef976a21dcd0ddd269 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1845652 Reviewed-by: Ryan Keane <rwkeane@google.com> Commit-Queue: mark a. foltz <mfoltz@chromium.org>
-rw-r--r--cast/common/channel/cast_socket_unittest.cc4
-rw-r--r--platform/api/tls_connection.h4
-rw-r--r--platform/impl/tls_connection_posix.cc4
-rw-r--r--platform/impl/tls_connection_posix.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/cast/common/channel/cast_socket_unittest.cc b/cast/common/channel/cast_socket_unittest.cc
index c16ce4dc..56a69a88 100644
--- a/cast/common/channel/cast_socket_unittest.cc
+++ b/cast/common/channel/cast_socket_unittest.cc
@@ -37,8 +37,8 @@ class MockTlsConnection final : public TlsConnection {
MOCK_METHOD(void, Write, (const void* data, size_t len));
- const IPEndpoint& local_address() const override { return local_address_; }
- const IPEndpoint& remote_address() const override { return remote_address_; }
+ IPEndpoint local_address() const override { return local_address_; }
+ IPEndpoint remote_address() const override { return remote_address_; }
void OnWriteBlocked() { TlsConnection::OnWriteBlocked(); }
void OnWriteUnblocked() { TlsConnection::OnWriteUnblocked(); }
diff --git a/platform/api/tls_connection.h b/platform/api/tls_connection.h
index de7faffa..a1b2965c 100644
--- a/platform/api/tls_connection.h
+++ b/platform/api/tls_connection.h
@@ -47,10 +47,10 @@ class TlsConnection {
virtual void Write(const void* data, size_t len) = 0;
// Get the local address.
- virtual const IPEndpoint& local_address() const = 0;
+ virtual IPEndpoint local_address() const = 0;
// Get the connected remote address.
- virtual const IPEndpoint& remote_address() const = 0;
+ virtual IPEndpoint remote_address() const = 0;
// Sets the client for this instance.
void set_client(Client* client) { client_ = client; }
diff --git a/platform/impl/tls_connection_posix.cc b/platform/impl/tls_connection_posix.cc
index 6a0f4353..45cef25c 100644
--- a/platform/impl/tls_connection_posix.cc
+++ b/platform/impl/tls_connection_posix.cc
@@ -77,13 +77,13 @@ void TlsConnectionPosix::Write(const void* data, size_t len) {
OSP_UNIMPLEMENTED();
}
-const IPEndpoint& TlsConnectionPosix::local_address() const {
+IPEndpoint TlsConnectionPosix::local_address() const {
const absl::optional<IPEndpoint> endpoint = socket_->local_address();
OSP_DCHECK(endpoint.has_value());
return endpoint.value();
}
-const IPEndpoint& TlsConnectionPosix::remote_address() const {
+IPEndpoint TlsConnectionPosix::remote_address() const {
const absl::optional<IPEndpoint> endpoint = socket_->remote_address();
OSP_DCHECK(endpoint.has_value());
return endpoint.value();
diff --git a/platform/impl/tls_connection_posix.h b/platform/impl/tls_connection_posix.h
index cf8c1a73..dfb3d785 100644
--- a/platform/impl/tls_connection_posix.h
+++ b/platform/impl/tls_connection_posix.h
@@ -39,8 +39,8 @@ class TlsConnectionPosix : public TlsConnection,
// TlsConnection overrides.
void Write(const void* data, size_t len) override;
- const IPEndpoint& local_address() const override;
- const IPEndpoint& remote_address() const override;
+ IPEndpoint local_address() const override;
+ IPEndpoint remote_address() const override;
// TlsWriteBuffer::Observer overrides.
void NotifyWriteBufferFill(double fraction) override;