From c35ae089aaa484b72c787625d2dd9a1481fa15b6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Aug 2017 00:33:28 +0300 Subject: Fix old style cast in sdltcpnet.cpp and tinyxml2.inc --- src/net/sdltcpnet.cpp | 6 ++++++ src/utils/xml/tinyxml2.inc | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp index 857e85140..063bf806f 100644 --- a/src/net/sdltcpnet.cpp +++ b/src/net/sdltcpnet.cpp @@ -154,7 +154,10 @@ TcpNet::SocketSet TcpNet::allocSocketSet(const int maxsockets) int TcpNet::addSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock) { + PRAGMACLANG6GCC(GCC diagnostic push) + PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast") return SDLNet_TCP_AddSocket(set, sock); + PRAGMACLANG6GCC(GCC diagnostic pop) } int TcpNet::socketReady(const TcpNet::Socket sock) @@ -177,7 +180,10 @@ int TcpNet::recv(const TcpNet::Socket sock, void *const data, const int maxlen) int TcpNet::delSocket(const TcpNet::SocketSet set, const TcpNet::Socket sock) { + PRAGMACLANG6GCC(GCC diagnostic push) + PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast") return SDLNet_TCP_DelSocket(set, sock); + PRAGMACLANG6GCC(GCC diagnostic pop) } void TcpNet::freeSocketSet(const TcpNet::SocketSet set) diff --git a/src/utils/xml/tinyxml2.inc b/src/utils/xml/tinyxml2.inc index 741cfa623..408638184 100644 --- a/src/utils/xml/tinyxml2.inc +++ b/src/utils/xml/tinyxml2.inc @@ -26,7 +26,10 @@ PRAGMA49(GCC diagnostic push) PRAGMA49(GCC diagnostic ignored "-Wzero-as-null-pointer-constant") PRAGMA49(GCC diagnostic ignored "-Wsuggest-override") +PRAGMACLANG6GCC(GCC diagnostic push) +PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast") #include +PRAGMACLANG6GCC(GCC diagnostic pop) PRAGMA49(GCC diagnostic pop) TINYXML2_INCLUDED -- cgit v1.2.3-60-g2f50