piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9721 from linkmauve/fix-warnings

Browse Source 
Fix some warnings found with gcc 11 and ffmpeg master
This commit is contained in:
Léo Lam
2021-11-06 14:38:07 +01:00
committed by GitHub
parent 39ccdc1f98 5a1333026b
commit 2c5d11cace
16 changed files with 114 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Boot/Boot.cpp
View File

@ -20,10 +20,9 @@ namespace fs = std::filesystem;
#include <utility>
#include <vector>
#include <zlib.h>
#include "Common/Align.h"
#include "Common/CDUtils.h"
#include "Common/CRC32.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
@ -355,9 +354,7 @@ bool CBoot::Load_BS2(const std::string& boot_rom_filename)
if (!File::ReadFileToString(boot_rom_filename, data))
return false;
// Use zlibs crc32 implementation to compute the hash
u32 ipl_hash = crc32(0L, Z_NULL, 0);
ipl_hash = crc32(ipl_hash, (const Bytef*)data.data(), (u32)data.size());
const u32 ipl_hash = Common::ComputeCRC32(data);
bool known_ipl = false;
bool pal_ipl = false;
switch (ipl_hash)

7
Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
View File

@ -546,8 +546,11 @@ void BluetoothRealDevice::SaveLinkKeys()
oss << Common::MacAddressToString(address);
oss << '=';
oss << std::hex;
for (const u16& data : entry.second)
oss << std::setfill('0') << std::setw(2) << data;
for (u8 data : entry.second)
{
// We cast to u16 here in order to have it displayed as two nibbles.
oss << std::setfill('0') << std::setw(2) << static_cast<u16>(data);
}
oss << std::dec << ',';
}
std::string config_string = oss.str();