summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-08-09 22:18:43 +0200
committerGitHub <noreply@github.com>2017-08-09 22:18:43 +0200
commitc2466a2f19dba63650183182ea5524deb3496070 (patch)
tree2d4c37837553a146bd962c1686690496242cee8d
parentMerge pull request #2822 from wwylele/sw_lighting-2 (diff)
parentUpdate cryptopp (diff)
downloadyuzu-c2466a2f19dba63650183182ea5524deb3496070.tar
yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.gz
yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.bz2
yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.lz
yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.xz
yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.zst
yuzu-c2466a2f19dba63650183182ea5524deb3496070.zip
Diffstat (limited to '')
m---------externals/cryptopp/cryptopp0
-rw-r--r--src/core/hle/service/cfg/cfg.cpp2
2 files changed, 1 insertions, 1 deletions
diff --git a/externals/cryptopp/cryptopp b/externals/cryptopp/cryptopp
-Subproject 841c37e34765487a2968357369ab74db8b10a62
+Subproject 24bc2b85674254fb294e717eb5b47d9f53e786b
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 6624f1711..3dbeb27cc 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -681,7 +681,7 @@ void GenerateConsoleUniqueId(u32& random_number, u64& console_id) {
CryptoPP::AutoSeededRandomPool rng;
random_number = rng.GenerateWord32(0, 0xFFFF);
u64_le local_friend_code_seed;
- rng.GenerateBlock(reinterpret_cast<byte*>(&local_friend_code_seed),
+ rng.GenerateBlock(reinterpret_cast<CryptoPP::byte*>(&local_friend_code_seed),
sizeof(local_friend_code_seed));
console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48);
}