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

Merge tag 'v0.20.9'

Browse Source 
release v0.20.9
This commit is contained in:
Max Kellermann
2017-06-04 12:57:05 +02:00
parent 1fa1790da5 cf86dfd317
commit 979f1b6c39
69 changed files with 240 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/curl/Global.cxx
View File

@@ -63,7 +63,7 @@ public:
*/
static int SocketFunction(CURL *easy,
curl_socket_t s, int action,
void *userp, void *socketp);
void *userp, void *socketp) noexcept;
virtual bool OnSocketReady(unsigned flags) override;
@@ -75,7 +75,7 @@ private:
}
gcc_const
static unsigned CurlPollToFlags(int action) {
static unsigned CurlPollToFlags(int action) noexcept {
switch (action) {
case CURL_POLL_NONE:
return 0;
@@ -108,7 +108,7 @@ CurlGlobal::CurlGlobal(EventLoop &_loop)
int
CurlSocket::SocketFunction(gcc_unused CURL *easy,
curl_socket_t s, int action,
void *userp, void *socketp) {
void *userp, void *socketp) noexcept {
auto &global = *(CurlGlobal *)userp;
CurlSocket *cs = (CurlSocket *)socketp;