summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-24 19:46:44 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-24 19:46:44 +0300
commit7e24d657b12d337fcb96cd4822f80745e5947b7d (patch)
treea23682c1c361f7bb34d1a4d68eb5048578403ff3
parent8b5d6d160aec650119062f495859a958a29157ba (diff)
downloadManaVerse-7e24d657b12d337fcb96cd4822f80745e5947b7d.tar.gz
ManaVerse-7e24d657b12d337fcb96cd4822f80745e5947b7d.tar.bz2
ManaVerse-7e24d657b12d337fcb96cd4822f80745e5947b7d.tar.xz
ManaVerse-7e24d657b12d337fcb96cd4822f80745e5947b7d.zip
Fix warning in clang 5.
-rw-r--r--src/net/sdltcpnet.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp
index e949b94f3..dea4d7d23 100644
--- a/src/net/sdltcpnet.cpp
+++ b/src/net/sdltcpnet.cpp
@@ -162,10 +162,13 @@ int TcpNet::addSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock)
int TcpNet::socketReady(const TcpNet::Socket sock)
{
+ PRAGMACLANG5(GCC diagnostic push)
+ PRAGMACLANG5(GCC diagnostic ignored "-Wzero-as-null-pointer-constant")
PRAGMACLANG6GCC(GCC diagnostic push)
PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
return SDLNet_SocketReady(sock);
PRAGMACLANG6GCC(GCC diagnostic pop)
+ PRAGMACLANG5(GCC diagnostic pop)
}
int TcpNet::checkSockets(const TcpNet::SocketSet set, const Uint32 timeout)