fix some clang warning errors

This commit is contained in:
Thomas Fussell 2016-11-27 16:56:38 +01:00
parent d353bbf42c
commit fecd239fcf
9 changed files with 10 additions and 10 deletions

View File

@ -31,7 +31,7 @@ namespace {
const std::unordered_map<int, std::string> known_locales()
{
const std::unordered_map<int, std::string> *all =
static const std::unordered_map<int, std::string> *all =
new std::unordered_map<int, std::string>(
{
{ 0x401, "Arabic - Saudi Arabia" },

View File

@ -2138,7 +2138,7 @@ std::vector<std::string> xlsx_consumer::read_namespaces()
return namespaces;
}
bool xlsx_consumer::in_element(const xml::qname &name)
bool xlsx_consumer::in_element(const xml::qname &/*name*/)
{
if (parser().peek() == xml::parser::event_type::end_element)
{

View File

@ -618,9 +618,9 @@ struct crypto_helper
iv.resize(16);
auto segment_begin = encrypted_package.begin() + static_cast<std::ptrdiff_t>(i);
auto current_segment_length = static_cast<std::ptrdiff_t>(
std::min(segment_length, encrypted_package.size() - i));
auto segment_end = encrypted_package.begin() + i + current_segment_length;
auto current_segment_length = std::min(segment_length, encrypted_package.size() - i);
auto segment_end = encrypted_package.begin()
+ static_cast<std::ptrdiff_t>(i + current_segment_length);
encrypted_segment.assign(segment_begin, segment_end);
auto decrypted_segment = aes(key, iv, encrypted_segment,
cipher_chaining::cbc, cipher_direction::decryption);

View File

@ -332,7 +332,7 @@ class ZipStreambufCompress : public std::streambuf
public:
ZipStreambufCompress(zip_file_header *central_header, std::ostream &stream)
: ostream(stream), header(central_header), valid(true)
: ostream(stream), strm({}), header(central_header), valid(true)
{
strm.zalloc = Z_NULL;
strm.zfree = Z_NULL;

2
third-party/botan vendored

@ -1 +1 @@
Subproject commit 5372d0b499ad317ab3776c9ac92df866cc6a1e84
Subproject commit 923a95d546df5b6d31f39b0af900d0361fb2e6a6

@ -1 +1 @@
Subproject commit f94dd7ccee2014ab6240efbf5074b2f39dc32225
Subproject commit 132522ca4c895e9b07d7e323d5529474806e5829

2
third-party/pugixml vendored

@ -1 +1 @@
Subproject commit 91bf70231aae8eddaccd5a6f5b0833712c471cb3
Subproject commit a832e8a5eff11f58a00ca41ec51ff3895b0da165

2
third-party/utfcpp vendored

@ -1 +1 @@
Subproject commit 0232ab8188b16ae6f2293a5817f1d9b0030879a3
Subproject commit a5ad5ec9d936d63e9c010d1054f8b11fed0fabbc