Skip to content

M
mpd
Unverified Commit 821d0899 authored by Rosen Penev's avatar Rosen Penev
Browse files
Options

remove GCC5 hacks

GCC5 cannot build mpd. Signed-off-by: 's avatarRosen Penev <rosenp@gmail.com>
parent e8380cf2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/lib/upnp/ContentDirectoryService.cxx
View file @ 821d0899
...@@ -69,9 +69,7 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const ...@@ -69,9 +69,7 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const
const char *s = ixmlwrap::getFirstElementValue(response.get(), const char *s = ixmlwrap::getFirstElementValue(response.get(),
"SearchCaps"); "SearchCaps");
if (s == nullptr || *s == 0) if (s == nullptr || *s == 0)
/* we could just "return {}" here, but GCC 5 doesn't return {};
understand that */
return std::forward_list<std::string>();
std::forward_list<std::string> result; std::forward_list<std::string> result;
for (const auto &i : IterableSplitString(s, ',')) for (const auto &i : IterableSplitString(s, ','))
......
src/net/IPv6Address.hxx
View file @ 821d0899
...@@ -178,7 +178,7 @@ public: ...@@ -178,7 +178,7 @@ public:
/** /**
* Is this an IPv4 address mapped inside struct sockaddr_in6? * Is this an IPv4 address mapped inside struct sockaddr_in6?
*/ */
#if defined(__linux__) && !GCC_OLDER_THAN(5,0) #if defined(__linux__)
constexpr constexpr
#endif #endif
bool IsV4Mapped() const noexcept { bool IsV4Mapped() const noexcept {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment