Merge pull request #4796 from lioncash/clang

core: Fix clang build
This commit is contained in:
LC
2020-10-20 19:19:12 -04:00
committed by GitHub
105 changed files with 906 additions and 667 deletions

View File

@ -53,10 +53,10 @@ struct DeliveryCacheProgressImpl {
ResultCode result = RESULT_SUCCESS;
DirectoryName current_directory;
FileName current_file;
s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
s64 current_total_bytes; ///< Bytes total on current file.
s64 total_downloaded_bytes; ///< Bytes downloaded on overall download.
s64 total_bytes; ///< Bytes total on overall download.
u64 current_downloaded_bytes; ///< Bytes downloaded on current file.
u64 current_total_bytes; ///< Bytes total on current file.
u64 total_downloaded_bytes; ///< Bytes downloaded on overall download.
u64 total_bytes; ///< Bytes total on overall download.
INSERT_PADDING_BYTES(
0x198); ///< Appears to be unused in official code, possibly reserved for future use.
};

View File

@ -3,7 +3,16 @@
// Refer to the license.txt file included.
#include <fmt/ostream.h>
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
#include <httplib.h>
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <mbedtls/sha256.h>
#include <nlohmann/json.hpp>
#include "common/hex_util.h"