summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-15 01:36:27 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-15 01:36:27 +0300
commitb2f9877c03a8af2a2c32b3d57470b6e573dc3c6a (patch)
tree35179017e68277ef89fc86f31828287ae104317f /src
parentb73ee4a22e3f0d1fad1bbe0a7f1ec3645436d8b9 (diff)
downloadmv-b2f9877c03a8af2a2c32b3d57470b6e573dc3c6a.tar.gz
mv-b2f9877c03a8af2a2c32b3d57470b6e573dc3c6a.tar.bz2
mv-b2f9877c03a8af2a2c32b3d57470b6e573dc3c6a.tar.xz
mv-b2f9877c03a8af2a2c32b3d57470b6e573dc3c6a.zip
Hide zlib warning about old cast.
Diffstat (limited to 'src')
-rw-r--r--src/fs/virtfs/zipreader.cpp4
-rw-r--r--src/resources/mapreader.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp
index 319528277..c97b2ec61 100644
--- a/src/fs/virtfs/zipreader.cpp
+++ b/src/fs/virtfs/zipreader.cpp
@@ -297,7 +297,11 @@ namespace ZipReader
strm.next_out = out;
strm.avail_out = CAST_U32(outSize);
+PRAGMACLANG6GCC(GCC diagnostic push)
+PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
int ret = inflateInit2(&strm, -MAX_WBITS);
+PRAGMACLANG6GCC(GCC diagnostic pop)
+
if (ret != Z_OK)
{
reportZlibError(header->zipEntry->root, ret);
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 6cba9b8f8..3d82d0404 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -137,7 +137,11 @@ int inflateMemory(unsigned char *restrict const in,
strm.next_out = out;
strm.avail_out = bufferSize;
+PRAGMACLANG6GCC(GCC diagnostic push)
+PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
int ret = inflateInit2(&strm, 15 + 32);
+PRAGMACLANG6GCC(GCC diagnostic pop)
+
if (ret != Z_OK)
return ret;