summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames <jselby@jselby.net>2017-08-08 09:50:09 +0200
committerJames <jselby@jselby.net>2017-08-08 09:50:09 +0200
commit1a44949ef75016fa48f9daa0cf3c973ef7d3978c (patch)
tree09eada71379ff9e43a30a1528e114effc964042a
parentMerge pull request #2860 from anodium/patch-1 (diff)
downloadyuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar.gz
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar.bz2
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar.lz
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar.xz
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.tar.zst
yuzu-1a44949ef75016fa48f9daa0cf3c973ef7d3978c.zip
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);
}