diff options
| author |  bunnei | 2017-08-09 16:18:43 -0400 |
|---|---|---|
| committer |  GitHub | 2017-08-09 16:18:43 -0400 |
| commit | c2466a2f19dba63650183182ea5524deb3496070 (patch) | |
| tree | 2d4c37837553a146bd962c1686690496242cee8d /src | |
| parent | Merge pull request #2822 from wwylele/sw_lighting-2 (diff) | |
| parent | Update cryptopp (diff) | |
| download | yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.gz yuzu-c2466a2f19dba63650183182ea5524deb3496070.tar.xz yuzu-c2466a2f19dba63650183182ea5524deb3496070.zip | |
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) { | |||
| 681 | CryptoPP::AutoSeededRandomPool rng; | 681 | CryptoPP::AutoSeededRandomPool rng; |
| 682 | random_number = rng.GenerateWord32(0, 0xFFFF); | 682 | random_number = rng.GenerateWord32(0, 0xFFFF); |
| 683 | u64_le local_friend_code_seed; | 683 | u64_le local_friend_code_seed; |
| 684 | rng.GenerateBlock(reinterpret_cast<byte*>(&local_friend_code_seed), | 684 | rng.GenerateBlock(reinterpret_cast<CryptoPP::byte*>(&local_friend_code_seed), |
| 685 | sizeof(local_friend_code_seed)); | 685 | sizeof(local_friend_code_seed)); |
| 686 | console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48); | 686 | console_id = (local_friend_code_seed & 0x3FFFFFFFF) | (static_cast<u64>(random_number) << 48); |
| 687 | } | 687 | } |