fix some gcc problems

This commit is contained in:
Thomas Fussell 2017-04-20 14:12:59 -04:00
parent b2a5110939
commit b26d764624
4 changed files with 4 additions and 4 deletions

View File

@ -21,9 +21,8 @@
// @license: http://www.opensource.org/licenses/mit-license.php
// @author: see AUTHORS file
#pragma once
#include <detail/cryptography/hash.hpp>
#include <detail/cryptography/sha.hpp>
namespace xlnt {
namespace detail {

View File

@ -23,6 +23,7 @@
#pragma once
#include <cstdint>
#include <vector>
namespace xlnt {

View File

@ -127,7 +127,7 @@ std::vector<std::uint8_t> encrypt_xlsx(
throw xlnt::exception("empty file");
}
generate_encryption_info(password);
write_encryption_info(password);
return {};
}

View File

@ -59,7 +59,7 @@ std::u16string utf8_to_utf16(const std::string &utf8_string)
std::string utf16_to_utf8(const std::u16string &utf16_string)
{
return std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,
char16_t>{}.to_bytes(utf8_string);
char16_t>{}.to_bytes(utf16_string);
}
#endif