diff options
| author | 2021-07-05 17:09:23 -0700 | |
|---|---|---|
| committer | 2021-07-05 17:09:23 -0700 | |
| commit | bf50345d4c13e34e69af0070632400b3472a1a11 (patch) | |
| tree | 1af5586d2d416c1a347ea0bfabed30a3a56d51e0 /src/video_core/command_classes | |
| parent | Merge pull request #6556 from Morph1984/default-mii (diff) | |
| parent | CMakeLists: Disable all warnings for external headers (diff) | |
| download | yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.gz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.tar.xz yuzu-bf50345d4c13e34e69af0070632400b3472a1a11.zip | |
Merge pull request #6537 from Morph1984/warnings
general: Enforce multiple warnings in MSVC
Diffstat (limited to 'src/video_core/command_classes')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.h | 8 | ||||
| -rw-r--r-- | src/video_core/command_classes/vic.cpp | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index f2aef1699..96c823c76 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h | |||
| @@ -14,18 +14,10 @@ extern "C" { | |||
| 14 | #pragma GCC diagnostic push | 14 | #pragma GCC diagnostic push |
| 15 | #pragma GCC diagnostic ignored "-Wconversion" | 15 | #pragma GCC diagnostic ignored "-Wconversion" |
| 16 | #endif | 16 | #endif |
| 17 | #ifdef _MSC_VER | ||
| 18 | #pragma warning(push) | ||
| 19 | #pragma warning(disable : 4242) // conversion from 'type' to 'type', possible loss of data | ||
| 20 | #pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data | ||
| 21 | #endif | ||
| 22 | #include <libavcodec/avcodec.h> | 17 | #include <libavcodec/avcodec.h> |
| 23 | #if defined(__GNUC__) || defined(__clang__) | 18 | #if defined(__GNUC__) || defined(__clang__) |
| 24 | #pragma GCC diagnostic pop | 19 | #pragma GCC diagnostic pop |
| 25 | #endif | 20 | #endif |
| 26 | #ifdef _MSC_VER | ||
| 27 | #pragma warning(pop) | ||
| 28 | #endif | ||
| 29 | } | 21 | } |
| 30 | 22 | ||
| 31 | namespace Tegra { | 23 | namespace Tegra { |
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp index 5faf8c0f1..ff3db0aee 100644 --- a/src/video_core/command_classes/vic.cpp +++ b/src/video_core/command_classes/vic.cpp | |||
| @@ -9,17 +9,10 @@ extern "C" { | |||
| 9 | #pragma GCC diagnostic push | 9 | #pragma GCC diagnostic push |
| 10 | #pragma GCC diagnostic ignored "-Wconversion" | 10 | #pragma GCC diagnostic ignored "-Wconversion" |
| 11 | #endif | 11 | #endif |
| 12 | #ifdef _MSC_VER | ||
| 13 | #pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data | ||
| 14 | #pragma warning(push) | ||
| 15 | #endif | ||
| 16 | #include <libswscale/swscale.h> | 12 | #include <libswscale/swscale.h> |
| 17 | #if defined(__GNUC__) || defined(__clang__) | 13 | #if defined(__GNUC__) || defined(__clang__) |
| 18 | #pragma GCC diagnostic pop | 14 | #pragma GCC diagnostic pop |
| 19 | #endif | 15 | #endif |
| 20 | #ifdef _MSC_VER | ||
| 21 | #pragma warning(pop) | ||
| 22 | #endif | ||
| 23 | } | 16 | } |
| 24 | 17 | ||
| 25 | #include "common/assert.h" | 18 | #include "common/assert.h" |