From 6ebac6a0b239d6b22faf40614c1e27e05820390f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 31 May 2022 13:48:51 +0200
Subject: [PATCH] net/StaticSocketAddress: use std::string_view instead of
StringView
---
src/net/StaticSocketAddress.cxx | 3 +--
src/net/StaticSocketAddress.hxx | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/net/StaticSocketAddress.cxx b/src/net/StaticSocketAddress.cxx
index 12e3704d0..ced0a4da3 100644
--- a/src/net/StaticSocketAddress.cxx
+++ b/src/net/StaticSocketAddress.cxx
@@ -30,7 +30,6 @@
#include "StaticSocketAddress.hxx"
#include "IPv4Address.hxx"
#include "IPv6Address.hxx"
-#include "util/StringView.hxx"
#include <algorithm>
@@ -46,7 +45,7 @@ StaticSocketAddress::operator=(SocketAddress other) noexcept
#ifdef HAVE_UN
-StringView
+std::string_view
StaticSocketAddress::GetLocalRaw() const noexcept
{
return SocketAddress(*this).GetLocalRaw();
diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx
index dc73e30e4..49f37100d 100644
--- a/src/net/StaticSocketAddress.hxx
+++ b/src/net/StaticSocketAddress.hxx
@@ -34,8 +34,7 @@
#include "Features.hxx"
#include <cassert>
-
-struct StringView;
+#include <string_view>
/**
* An OO wrapper for struct sockaddr_storage.
@@ -120,7 +119,7 @@ public:
* @see SocketAddress::GetLocalRaw()
*/
[[gnu::pure]]
- StringView GetLocalRaw() const noexcept;
+ std::string_view GetLocalRaw() const noexcept;
#endif
#ifdef HAVE_TCP