oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'gcc5' of git://github.com/neheb/MPD into master

Browse Source
This commit is contained in:
Max Kellermann 2020-09-21 09:07:19 +02:00
commit 7552f70c8d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/upnp/ContentDirectoryService.cxx
View File

@ -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, ','))

2
src/net/IPv6Address.hxx
View File

@ -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 {