diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-09-16 18:09:03 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-09-16 18:10:27 -0700 |
| commit | 821d08999ab0c94d2224ebd6734b9152924ea20e (patch) | |
| tree | 5e8e31ba44946e8028ceca3a577afdd14e08cc96 /src | |
| parent | e8380cf2aa9ff7517d5ea3ada33a40df09d8542c (diff) | |
remove GCC5 hacks
GCC5 cannot build mpd.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/upnp/ContentDirectoryService.cxx | 4 | ||||
| -rw-r--r-- | src/net/IPv6Address.hxx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx index 4c80820e6..56d1cf3aa 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -69,9 +69,7 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const const char *s = ixmlwrap::getFirstElementValue(response.get(), "SearchCaps"); if (s == nullptr || *s == 0) - /* we could just "return {}" here, but GCC 5 doesn't - understand that */ - return std::forward_list<std::string>(); + return {}; std::forward_list<std::string> result; for (const auto &i : IterableSplitString(s, ',')) diff --git a/src/net/IPv6Address.hxx b/src/net/IPv6Address.hxx index 4f75c81fc..52606024f 100644 --- a/src/net/IPv6Address.hxx +++ b/src/net/IPv6Address.hxx @@ -178,7 +178,7 @@ public: /** * Is this an IPv4 address mapped inside struct sockaddr_in6? */ -#if defined(__linux__) && !GCC_OLDER_THAN(5,0) +#if defined(__linux__) constexpr #endif bool IsV4Mapped() const noexcept { |