diff options
| author |  LC | 2020-10-20 22:08:53 -0400 |
|---|---|---|
| committer |  GitHub | 2020-10-20 22:08:53 -0400 |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/audio_core/sink_context.cpp | |
| parent | kernel: Fix build with recent compiler flag changes (diff) | |
| parent | Revert "core: Fix clang build" (diff) | |
| download | yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip | |
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/audio_core/sink_context.cpp')
| -rw-r--r-- | src/audio_core/sink_context.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/audio_core/sink_context.cpp b/src/audio_core/sink_context.cpp index 3d713814a..0882b411a 100644 --- a/src/audio_core/sink_context.cpp +++ b/src/audio_core/sink_context.cpp | |||
| @@ -23,9 +23,8 @@ bool SinkContext::InUse() const { | |||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | std::vector<u8> SinkContext::OutputBuffers() const { | 25 | std::vector<u8> SinkContext::OutputBuffers() const { |
| 26 | const auto output_use_count = static_cast<size_t>(use_count); | 26 | std::vector<u8> buffer_ret(use_count); |
| 27 | std::vector<u8> buffer_ret(output_use_count); | 27 | std::memcpy(buffer_ret.data(), buffers.data(), use_count); |
| 28 | std::memcpy(buffer_ret.data(), buffers.data(), output_use_count); | ||
| 29 | return buffer_ret; | 28 | return buffer_ret; |
| 30 | } | 29 | } |
| 31 | 30 | ||