diff options
| author |  Liam | 2022-06-07 18:56:38 -0400 |
|---|---|---|
| committer | Liam | 2022-06-13 20:09:30 -0400 |
| commit | d11547024c2c14b913ed8743de5e345260e3c19f (patch) | |
| tree | 249f96ff849b6a509d46295e78ae9c3f91d9ec20 /src | |
| parent | kernel: ensure class token lambda exit is unreachable (diff) | |
| download | yuzu-d11547024c2c14b913ed8743de5e345260e3c19f.tar.gz yuzu-d11547024c2c14b913ed8743de5e345260e3c19f.tar.xz yuzu-d11547024c2c14b913ed8743de5e345260e3c19f.zip | |
general: fix compilation on GCC 12
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/content_archive.cpp | 2 | ||||
| -rw-r--r-- | src/shader_recompiler/frontend/maxwell/control_flow.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 93f784418..78e56bbbd 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp | |||
| @@ -419,7 +419,7 @@ std::optional<Core::Crypto::Key128> NCA::GetKeyAreaKey(NCASectionCryptoType type | |||
| 419 | Core::Crypto::Mode::ECB); | 419 | Core::Crypto::Mode::ECB); |
| 420 | cipher.Transcode(key_area.data(), key_area.size(), key_area.data(), Core::Crypto::Op::Decrypt); | 420 | cipher.Transcode(key_area.data(), key_area.size(), key_area.data(), Core::Crypto::Op::Decrypt); |
| 421 | 421 | ||
| 422 | Core::Crypto::Key128 out; | 422 | Core::Crypto::Key128 out{}; |
| 423 | if (type == NCASectionCryptoType::XTS) { | 423 | if (type == NCASectionCryptoType::XTS) { |
| 424 | std::copy(key_area.begin(), key_area.begin() + 0x10, out.begin()); | 424 | std::copy(key_area.begin(), key_area.begin() + 0x10, out.begin()); |
| 425 | } else if (type == NCASectionCryptoType::CTR || type == NCASectionCryptoType::BKTR) { | 425 | } else if (type == NCASectionCryptoType::CTR || type == NCASectionCryptoType::BKTR) { |
diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.h b/src/shader_recompiler/frontend/maxwell/control_flow.h index 2487b9b0b..1ce45b3a5 100644 --- a/src/shader_recompiler/frontend/maxwell/control_flow.h +++ b/src/shader_recompiler/frontend/maxwell/control_flow.h | |||
| @@ -58,7 +58,7 @@ public: | |||
| 58 | [[nodiscard]] Stack Remove(Token token) const; | 58 | [[nodiscard]] Stack Remove(Token token) const; |
| 59 | 59 | ||
| 60 | private: | 60 | private: |
| 61 | boost::container::small_vector<StackEntry, 3> entries; | 61 | std::vector<StackEntry> entries; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | struct IndirectBranch { | 64 | struct IndirectBranch { |