diff options
| author | 2023-05-06 23:10:09 -0400 | |
|---|---|---|
| committer | 2023-05-06 23:10:09 -0400 | |
| commit | 27ff00acb1b38b6ac279cce2451c1c06ea9af5b1 (patch) | |
| tree | ed37001e5ec773299f039f1561e091911705f9e7 | |
| parent | Merge pull request #10165 from merryhime/update-dynarmic (diff) | |
| parent | yuzu-sdl,audio_core: Remove antiquated warning ignore (diff) | |
| download | yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.gz yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.tar.xz yuzu-27ff00acb1b38b6ac279cce2451c1c06ea9af5b1.zip | |
Merge pull request #10162 from lat9nq/sdl-remove-old
yuzu-sdl,audio_core: Remove antiquated warning ignore
| -rw-r--r-- | src/audio_core/sink/sdl2_sink.cpp | 11 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 12 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index ee1a0652f..c1529d1f9 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <span> | 4 | #include <span> |
| 5 | #include <vector> | 5 | #include <vector> |
| 6 | #include <SDL.h> | ||
| 6 | 7 | ||
| 7 | #include "audio_core/common/common.h" | 8 | #include "audio_core/common/common.h" |
| 8 | #include "audio_core/sink/sdl2_sink.h" | 9 | #include "audio_core/sink/sdl2_sink.h" |
| @@ -10,16 +11,6 @@ | |||
| 10 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 11 | #include "core/core.h" | 12 | #include "core/core.h" |
| 12 | 13 | ||
| 13 | // Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 | ||
| 14 | #ifdef __clang__ | ||
| 15 | #pragma clang diagnostic push | ||
| 16 | #pragma clang diagnostic ignored "-Wimplicit-fallthrough" | ||
| 17 | #endif | ||
| 18 | #include <SDL.h> | ||
| 19 | #ifdef __clang__ | ||
| 20 | #pragma clang diagnostic pop | ||
| 21 | #endif | ||
| 22 | |||
| 23 | namespace AudioCore::Sink { | 14 | namespace AudioCore::Sink { |
| 24 | /** | 15 | /** |
| 25 | * SDL sink stream, responsible for sinking samples to hardware. | 16 | * SDL sink stream, responsible for sinking samples to hardware. |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 605280949..352e6a4c7 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -4,18 +4,8 @@ | |||
| 4 | #include <memory> | 4 | #include <memory> |
| 5 | #include <optional> | 5 | #include <optional> |
| 6 | #include <sstream> | 6 | #include <sstream> |
| 7 | |||
| 8 | // Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307 | ||
| 9 | #ifdef __clang__ | ||
| 10 | #pragma clang diagnostic push | ||
| 11 | #pragma clang diagnostic ignored "-Wimplicit-fallthrough" | ||
| 12 | #endif | ||
| 13 | #include <SDL.h> | ||
| 14 | #ifdef __clang__ | ||
| 15 | #pragma clang diagnostic pop | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #include <INIReader.h> | 7 | #include <INIReader.h> |
| 8 | #include <SDL.h> | ||
| 19 | #include "common/fs/file.h" | 9 | #include "common/fs/file.h" |
| 20 | #include "common/fs/fs.h" | 10 | #include "common/fs/fs.h" |
| 21 | #include "common/fs/path_util.h" | 11 | #include "common/fs/path_util.h" |