diff options
| author | Max Kellermann <max@musicpd.org> | 2019-04-04 10:29:58 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-04-04 10:29:58 +0200 |
| commit | ea5e6d8f33d548d7d9d9b9bb49be33df79e6cac1 (patch) | |
| tree | 07590b5e710ee80e6c4e573c35f4c55181c862fd /src/net | |
| parent | c1272c72b06cf80e43dcd94b3e765fef35e05f60 (diff) | |
| parent | f6941f9a44037da0b7a1407052bd207d988273d7 (diff) | |
Merge branch 'v0.21.x'
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/IPv4Address.hxx | 2 | ||||
| -rw-r--r-- | src/net/IPv6Address.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/net/IPv4Address.hxx b/src/net/IPv4Address.hxx index e1ca39dfa..e040c7c5b 100644 --- a/src/net/IPv4Address.hxx +++ b/src/net/IPv4Address.hxx @@ -168,7 +168,7 @@ public: } constexpr operator SocketAddress() const noexcept { - return SocketAddress((const struct sockaddr *)&address, + return SocketAddress((const struct sockaddr *)(const void *)&address, sizeof(address)); } diff --git a/src/net/IPv6Address.hxx b/src/net/IPv6Address.hxx index a2911280a..a3aa695a5 100644 --- a/src/net/IPv6Address.hxx +++ b/src/net/IPv6Address.hxx @@ -135,7 +135,7 @@ public: } constexpr operator SocketAddress() const noexcept { - return SocketAddress((const struct sockaddr *)&address, + return SocketAddress((const struct sockaddr *)(const void *)&address, sizeof(address)); } |