diff options
| author | bunnei <bunneidev@gmail.com> | 2017-08-09 16:18:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 16:18:43 -0400 |
| commit | c2466a2f19dba63650183182ea5524deb3496070 (patch) | |
| tree | 2d4c37837553a146bd962c1686690496242cee8d /src | |
| parent | 792dee47a7b520cb2a8d7cf43cc184c17394708f (diff) | |
| parent | 1a44949ef75016fa48f9daa0cf3c973ef7d3978c (diff) | |
Merge pull request #2862 from j-selby/update-cryptopp
Update CryptoPP (byte ambiguity)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |