Skip to content

Commit 20a0f8d

Browse files
committed
miniz: silence warnings
This is third-party code.
1 parent 3e7bc8e commit 20a0f8d

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

jbmc/src/java_bytecode/mz_zip_archive.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ std::string mz_zip_archivet::get_filename(const size_t index)
7676
const auto id=static_cast<mz_uint>(index);
7777
std::vector<char> buffer;
7878
buffer.resize(mz_zip_reader_get_filename(m_state.get(), id, nullptr, 0));
79+
#include <util/pragma_push.def>
80+
#include <util/pragma_wconversion.def>
7981
mz_zip_reader_get_filename(m_state.get(), id, buffer.data(), buffer.size());
82+
#include <util/pragma_pop.def>
8083
// Buffer may contain junk returned after \0
8184
const auto null_char_it=std::find(buffer.cbegin(), buffer.cend(), '\0');
8285
return { buffer.cbegin(), null_char_it };

jbmc/src/miniz/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC = miniz.cpp \
22
# Empty last line
33

4-
INCLUDES= -I ..
4+
INCLUDES= -I .. -I ../$(CPROVER_DIR)/src
55

66
include ../config.inc
77
include ../$(CPROVER_DIR)/src/config.inc

jbmc/src/miniz/miniz.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
*
2525
**************************************************************************/
2626

27+
#include <util/pragma_wconversion.def>
28+
#ifdef _MSC_VER
29+
#pragma warning(disable:4548)
30+
// expression before comma has no effect
31+
#pragma warning(disable:4061)
32+
// enum case is not handled in switch
33+
#endif
34+
2735
#include "miniz.h"
2836

2937
typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];

jbmc/src/miniz/miniz.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@
173173
#pragma once
174174

175175

176+
#ifdef _MSC_VER
177+
#pragma warning(disable:4668)
178+
// using #if/#elif on undefined macro
179+
#endif
176180

177181

178182

0 commit comments

Comments
 (0)