Эх сурвалжийг харах

Merge pull request #10162 from lat9nq/sdl-remove-old

yuzu-sdl,audio_core: Remove antiquated warning ignore
liamwhite 3 жил өмнө
parent
commit
27ff00acb1

+ 1 - 10
src/audio_core/sink/sdl2_sink.cpp

@@ -3,6 +3,7 @@
 
 
 #include <span>
 #include <span>
 #include <vector>
 #include <vector>
+#include <SDL.h>
 
 
 #include "audio_core/common/common.h"
 #include "audio_core/common/common.h"
 #include "audio_core/sink/sdl2_sink.h"
 #include "audio_core/sink/sdl2_sink.h"
@@ -10,16 +11,6 @@
 #include "common/logging/log.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core.h"
 
 
-// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#endif
-#include <SDL.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 namespace AudioCore::Sink {
 namespace AudioCore::Sink {
 /**
 /**
  * SDL sink stream, responsible for sinking samples to hardware.
  * SDL sink stream, responsible for sinking samples to hardware.

+ 1 - 11
src/yuzu_cmd/config.cpp

@@ -4,18 +4,8 @@
 #include <memory>
 #include <memory>
 #include <optional>
 #include <optional>
 #include <sstream>
 #include <sstream>
-
-// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#endif
-#include <SDL.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 #include <INIReader.h>
 #include <INIReader.h>
+#include <SDL.h>
 #include "common/fs/file.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/fs/path_util.h"