cmake, code: Abuse pre-processor to disable/enable warnings

.clang-format

@@ -20,6 +20,8 @@ NamespaceIndentation: All
 # Includes
 #IncludeBlocks: Regroup
 IncludeCategories:
+  - Regex: '^"warning-disable.hpp"$'
+    Priority: 50
   - Regex: '^(<|")(config.hpp|common.hpp|ui-common.hpp|strings.hpp|version.hpp|obs.h)("|>)'
     Priority: 100
   - Regex: '^<obs-'
@@ -32,6 +34,8 @@ IncludeCategories:
     Priority: 300
   - Regex: '.moc"$'
     Priority: 300
+  - Regex: '^"warning-enable.hpp"$'
+    Priority: 500
 SortIncludes: true
 
 # Alignment

CMakeLists.txt

@@ -1036,6 +1036,8 @@ endif()
 
 # Core
 list(APPEND PROJECT_PRIVATE_SOURCE
+	"source/warning-disable.hpp"
+	"source/warning-enable.hpp"
 	"source/configuration.hpp"
 	"source/configuration.cpp"
 	"source/common.hpp"

source/common.hpp

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include "warning-disable.hpp"
+
 // Common C includes
 #include <cfloat>
 #include <cinttypes>
@@ -44,6 +46,8 @@
 #include <utility>
 #include <vector>
 
+#include "warning-enable.hpp"
+
 // Common Plugin includes
 #include "config.hpp"
 #include "strings.hpp"
@@ -56,17 +60,8 @@
 #include "util/utility.hpp"
 
 // Common OBS includes
+#include "warning-disable.hpp"
 extern "C" {
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <obs.h>
 
 #include <obs-config.h>
@@ -85,15 +80,11 @@ extern "C" {
 #include <graphics/vec4.h>
 
 #include <util/platform.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 
 // Fix libOBS's global defines
 #undef strtoll
 }
+#include "warning-enable.hpp"
 
 // Common Global defines
 /// Logging

source/configuration.hpp

@@ -19,8 +19,11 @@
 
 #pragma once
 #include "common.hpp"
+
+#include "warning-disable.hpp"
 #include <filesystem>
 #include <memory>
+#include "warning-enable.hpp"
 
 namespace streamfx {
 	class configuration {

source/encoders/encoder-aom-av1.cpp

@@ -23,9 +23,12 @@
 //--------------------------------------------------------------------------------//
 
 #include "encoder-aom-av1.hpp"
+#include "util/util-logging.hpp"
+
+#include "warning-disable.hpp"
 #include <filesystem>
 #include <thread>
-#include "util/util-logging.hpp"
+#include "warning-enable.hpp"
 
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "

source/encoders/encoder-aom-av1.hpp

@@ -24,30 +24,20 @@
 
 #pragma once
 #include "common.hpp"
-#include <memory>
-#include <queue>
 #include "encoders/codecs/av1.hpp"
 #include "obs/obs-encoder-factory.hpp"
 #include "util/util-library.hpp"
 #include "util/util-profiler.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include <queue>
+#include "warning-enable.hpp"
+
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <aom/aomcx.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 };
 
 namespace streamfx::encoder::aom::av1 {

source/encoders/encoder-ffmpeg.cpp

@@ -21,13 +21,30 @@
 
 #include "encoder-ffmpeg.hpp"
 #include "strings.hpp"
-#include <sstream>
 #include "codecs/hevc.hpp"
 #include "ffmpeg/tools.hpp"
 #include "handlers/debug_handler.hpp"
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <sstream>
+#include "warning-enable.hpp"
+
+extern "C" {
+#include "warning-disable.hpp"
+#include <obs-avc.h>
+#include "warning-enable.hpp"
+
+#include "warning-disable.hpp"
+#include <libavcodec/avcodec.h>
+#include <libavutil/dict.h>
+#include <libavutil/frame.h>
+#include <libavutil/opt.h>
+#include <libavutil/pixdesc.h>
+#include "warning-enable.hpp"
+}
+
 #ifdef ENABLE_ENCODER_FFMPEG_AMF
 #include "handlers/amf_h264_handler.hpp"
 #include "handlers/amf_hevc_handler.hpp"
@@ -46,46 +63,6 @@
 #include "handlers/dnxhd_handler.hpp"
 #endif
 
-extern "C" {
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
-#include <obs-avc.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
-#include <libavcodec/avcodec.h>
-#include <libavutil/dict.h>
-#include <libavutil/frame.h>
-#include <libavutil/opt.h>
-#include <libavutil/pixdesc.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
-}
-
 #ifdef WIN32
 #include "ffmpeg/hwapi/d3d11.hpp"
 #endif

source/encoders/encoder-ffmpeg.hpp

@@ -21,6 +21,13 @@
 
 #pragma once
 #include "common.hpp"
+#include "ffmpeg/avframe-queue.hpp"
+#include "ffmpeg/hwapi/base.hpp"
+#include "ffmpeg/swscale.hpp"
+#include "handlers/handler.hpp"
+#include "obs/obs-encoder-factory.hpp"
+
+#include "warning-disable.hpp"
 #include <condition_variable>
 #include <map>
 #include <mutex>
@@ -28,27 +35,13 @@
 #include <stack>
 #include <thread>
 #include <vector>
-#include "ffmpeg/avframe-queue.hpp"
+#include "warning-enable.hpp"
-#include "ffmpeg/hwapi/base.hpp"
-#include "ffmpeg/swscale.hpp"
-#include "handlers/handler.hpp"
-#include "obs/obs-encoder-factory.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/frame.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg {

source/encoders/handlers/amf_h264_handler.cpp

@@ -28,22 +28,9 @@
 #include "ffmpeg/tools.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 // Settings

source/encoders/handlers/amf_h264_handler.hpp

@@ -26,22 +26,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/amf_hevc_handler.cpp

@@ -31,19 +31,9 @@
 #include "plugin.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 // Settings

source/encoders/handlers/amf_hevc_handler.hpp

@@ -25,22 +25,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/amf_shared.cpp

@@ -27,22 +27,9 @@
 #include "ffmpeg/tools.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 // Translation

source/encoders/handlers/amf_shared.hpp

@@ -26,22 +26,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler::amf {

source/encoders/handlers/debug_handler.cpp

@@ -21,30 +21,20 @@
 
 #include "debug_handler.hpp"
 #include "common.hpp"
+#include "handler.hpp"
+#include "plugin.hpp"
+
+#include "warning-disable.hpp"
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
-#include "handler.hpp"
+#include "warning-enable.hpp"
-#include "plugin.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 using namespace streamfx::encoder::ffmpeg::handler;

source/encoders/handlers/dnxhd_handler.cpp

@@ -1,10 +1,13 @@
 #include "dnxhd_handler.hpp"
 #include "common.hpp"
-#include <array>
 #include "../codecs/dnxhr.hpp"
 #include "ffmpeg/tools.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <array>
+#include "warning-enable.hpp"
+
 using namespace streamfx::encoder::ffmpeg::handler;
 using namespace streamfx::encoder::codec::dnxhr;
 

source/encoders/handlers/dnxhd_handler.hpp

@@ -24,22 +24,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/handler.hpp

@@ -24,22 +24,9 @@
 #include "ffmpeg/hwapi/base.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg {

source/encoders/handlers/nvenc_h264_handler.cpp

@@ -29,22 +29,9 @@
 #include "plugin.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 #define ST_KEY_PROFILE "H264.Profile"

source/encoders/handlers/nvenc_h264_handler.hpp

@@ -23,22 +23,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/nvenc_hevc_handler.cpp

@@ -29,22 +29,9 @@
 #include "plugin.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 #define ST_KEY_PROFILE "H265.Profile"

source/encoders/handlers/nvenc_hevc_handler.hpp

@@ -23,22 +23,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/nvenc_shared.cpp

@@ -24,22 +24,9 @@
 #include "ffmpeg/tools.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/opt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 #define ST_I18N_PRESET "Encoder.FFmpeg.NVENC.Preset"

source/encoders/handlers/nvenc_shared.hpp

@@ -24,14 +24,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#endif
 }
 
 /* NVENC has multiple compression modes:

source/encoders/handlers/prores_aw_handler.cpp

@@ -21,11 +21,14 @@
 
 #include "prores_aw_handler.hpp"
 #include "common.hpp"
-#include <array>
 #include "../codecs/prores.hpp"
 #include "ffmpeg/tools.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <array>
+#include "warning-enable.hpp"
+
 using namespace streamfx::encoder::ffmpeg::handler;
 using namespace streamfx::encoder::codec::prores;
 

source/encoders/handlers/prores_aw_handler.hpp

@@ -23,22 +23,9 @@
 #include "handler.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/ffmpeg/avframe-queue.hpp

@@ -21,23 +21,16 @@
 
 #pragma once
 #include "common.hpp"
+
+#include "warning-disable.hpp"
 #include <deque>
 #include <mutex>
+#include "warning-enable.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/frame.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::ffmpeg {

source/ffmpeg/hwapi/base.hpp

@@ -21,24 +21,17 @@
 
 #pragma once
 #include "common.hpp"
+
+#include "warning-disable.hpp"
 #include <list>
 #include <utility>
+#include "warning-enable.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/frame.h>
 #include <libavutil/hwcontext.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::ffmpeg::hwapi {

source/ffmpeg/hwapi/d3d11.cpp

@@ -22,24 +22,17 @@
 #ifdef WIN32
 
 #include "d3d11.hpp"
-#include <sstream>
-#include <vector>
 #include "obs/gs/gs-helper.hpp"
 
+#include "warning-disable.hpp"
+#include <sstream>
+#include <vector>
+#include "warning-enable.hpp"
+
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/hwcontext_d3d11va.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 using namespace streamfx::ffmpeg::hwapi;

source/ffmpeg/hwapi/d3d11.hpp

@@ -22,22 +22,12 @@
 #pragma once
 #include "base.hpp"
 
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <atlutil.h>
 #include <d3d11.h>
 #include <d3d11_1.h>
 #include <dxgi.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 
 namespace streamfx::ffmpeg::hwapi {
 	class d3d11 : public streamfx::ffmpeg::hwapi::base {

source/ffmpeg/swscale.cpp

@@ -20,7 +20,10 @@
 // SOFTWARE.
 
 #include "swscale.hpp"
+
+#include "warning-disable.hpp"
 #include <stdexcept>
+#include "warning-enable.hpp"
 
 using namespace streamfx::ffmpeg;
 

source/ffmpeg/swscale.hpp

@@ -21,23 +21,16 @@
 
 #pragma once
 #include "common.hpp"
+
+#include "warning-disable.hpp"
 #include <utility>
+#include "warning-enable.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::ffmpeg {

source/ffmpeg/tools.cpp

@@ -20,27 +20,20 @@
 // SOFTWARE.
 
 #include "tools.hpp"
-#include <list>
-#include <sstream>
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <list>
+#include <sstream>
+#include "warning-enable.hpp"
+
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/error.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 using namespace streamfx::ffmpeg;

source/ffmpeg/tools.hpp

@@ -21,24 +21,17 @@
 
 #pragma once
 #include "common.hpp"
+
+#include "warning-disable.hpp"
 #include <functional>
+#include "warning-enable.hpp"
 
 extern "C" {
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixfmt.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 }
 
 namespace streamfx::ffmpeg::tools {

source/filters/filter-autoframing.hpp

@@ -18,10 +18,6 @@
  */
 
 #pragma once
-#include <atomic>
-#include <list>
-#include <memory>
-#include <mutex>
 #include "gfx/gfx-debug.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
@@ -31,6 +27,13 @@
 #include "util/util-threadpool.hpp"
 #include "util/utility.hpp"
 
+#include "warning-disable.hpp"
+#include <atomic>
+#include <list>
+#include <memory>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef ENABLE_FILTER_AUTOFRAMING_NVIDIA
 #include "nvidia/ar/nvidia-ar-facedetection.hpp"
 #endif

source/filters/filter-blur.cpp

@@ -19,11 +19,6 @@
 
 #include "filter-blur.hpp"
 #include "strings.hpp"
-#include <cfloat>
-#include <cinttypes>
-#include <cmath>
-#include <map>
-#include <stdexcept>
 #include "gfx/blur/gfx-blur-box-linear.hpp"
 #include "gfx/blur/gfx-blur-box.hpp"
 #include "gfx/blur/gfx-blur-dual-filtering.hpp"
@@ -33,6 +28,22 @@
 #include "obs/obs-source-tracker.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <cfloat>
+#include <cinttypes>
+#include <cmath>
+#include <map>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
+// OBS
+#include "warning-disable.hpp"
+#include <callback/signal.h>
+#include <graphics/graphics.h>
+#include <graphics/matrix4.h>
+#include <util/platform.h>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)
@@ -47,19 +58,6 @@
 #define D_LOG_DEBUG(...) P_LOG_DEBUG(ST_PREFIX __VA_ARGS__)
 #endif
 
-// OBS
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <callback/signal.h>
-#include <graphics/graphics.h>
-#include <graphics/matrix4.h>
-#include <util/platform.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 // Translation Strings
 #define ST_I18N "Filter.Blur"
 

source/filters/filter-blur.hpp

@@ -19,10 +19,6 @@
 
 #pragma once
 #include "common.hpp"
-#include <chrono>
-#include <functional>
-#include <list>
-#include <map>
 #include "gfx/blur/gfx-blur-base.hpp"
 #include "gfx/gfx-source-texture.hpp"
 #include "obs/gs/gs-effect.hpp"
@@ -31,6 +27,13 @@
 #include "obs/gs/gs-texture.hpp"
 #include "obs/obs-source-factory.hpp"
 
+#include "warning-disable.hpp"
+#include <chrono>
+#include <functional>
+#include <list>
+#include <map>
+#include "warning-enable.hpp"
+
 namespace streamfx::filter::blur {
 	enum class mask_type : int64_t {
 		Region,

source/filters/filter-color-grade.cpp

@@ -19,10 +19,22 @@
 
 #include "filter-color-grade.hpp"
 #include "strings.hpp"
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
+// OBS
+#include "warning-disable.hpp"
+extern "C" {
+#include <graphics/graphics.h>
+#include <graphics/matrix4.h>
+#include <util/platform.h>
+}
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)
@@ -37,18 +49,6 @@
 #define D_LOG_DEBUG(...) P_LOG_DEBUG(ST_PREFIX __VA_ARGS__)
 #endif
 
-// OBS
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <graphics/graphics.h>
-#include <graphics/matrix4.h>
-#include <util/platform.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #define ST_I18N "Filter.ColorGrade"
 // Lift
 #define ST_KEY_LIFT "Filter.ColorGrade.Lift"

source/filters/filter-color-grade.hpp

@@ -18,7 +18,6 @@
  */
 
 #pragma once
-#include <vector>
 #include "gfx/lut/gfx-lut-consumer.hpp"
 #include "gfx/lut/gfx-lut-producer.hpp"
 #include "gfx/lut/gfx-lut.hpp"
@@ -29,6 +28,10 @@
 #include "obs/obs-source-factory.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::filter::color_grade {
 	enum class detection_mode {
 		HSV,

source/filters/filter-denoising.cpp

@@ -19,11 +19,14 @@
 // SOFTWARE.
 
 #include "filter-denoising.hpp"
-#include <algorithm>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-denoising.hpp

@@ -19,9 +19,6 @@
 // SOFTWARE.
 
 #pragma once
-#include <atomic>
-#include <memory>
-#include <mutex>
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
@@ -29,6 +26,12 @@
 #include "plugin.hpp"
 #include "util/util-threadpool.hpp"
 
+#include "warning-disable.hpp"
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef ENABLE_FILTER_DENOISING_NVIDIA
 #include "nvidia/vfx/nvidia-vfx-denoising.hpp"
 #endif

source/filters/filter-displacement.cpp

@@ -23,11 +23,14 @@
 
 #include "filter-displacement.hpp"
 #include "strings.hpp"
-#include <stdexcept>
-#include <sys/stat.h>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include <sys/stat.h>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-dynamic-mask.cpp

@@ -19,11 +19,14 @@
 
 #include "filter-dynamic-mask.hpp"
 #include "strings.hpp"
+#include "obs/gs/gs-helper.hpp"
+#include "util/util-logging.hpp"
+
+#include "warning-disable.hpp"
 #include <sstream>
 #include <stdexcept>
 #include <vector>
-#include "obs/gs/gs-helper.hpp"
+#include "warning-enable.hpp"
-#include "util/util-logging.hpp"
 
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "

source/filters/filter-dynamic-mask.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 #include "common.hpp"
-#include <list>
-#include <map>
 #include "gfx/gfx-source-texture.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/obs-source-active-reference.hpp"
@@ -30,6 +28,11 @@
 #include "obs/obs-source.hpp"
 #include "obs/obs-tools.hpp"
 
+#include "warning-disable.hpp"
+#include <list>
+#include <map>
+#include "warning-enable.hpp"
+
 namespace streamfx::filter::dynamic_mask {
 	enum class channel : int8_t { Invalid = -1, Red, Green, Blue, Alpha };
 

source/filters/filter-sdf-effects.cpp

@@ -19,10 +19,13 @@
 
 #include "filter-sdf-effects.hpp"
 #include "strings.hpp"
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-shader.cpp

@@ -19,10 +19,13 @@
 
 #include "filter-shader.hpp"
 #include "strings.hpp"
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-transform.cpp

@@ -19,11 +19,21 @@
 
 #include "filter-transform.hpp"
 #include "strings.hpp"
-#include <algorithm>
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
+// OBS
+#include "warning-disable.hpp"
+#include <graphics/graphics.h>
+#include <graphics/matrix4.h>
+#include <util/platform.h>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)
@@ -38,18 +48,6 @@
 #define D_LOG_DEBUG(...) P_LOG_DEBUG(ST_PREFIX __VA_ARGS__)
 #endif
 
-// OBS
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <graphics/graphics.h>
-#include <graphics/matrix4.h>
-#include <util/platform.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #define ST_I18N "Filter.Transform"
 #define ST_I18N_CAMERA ST_I18N ".Camera"
 #define ST_I18N_CAMERA_MODE ST_I18N_CAMERA ".Mode"

source/filters/filter-transform.hpp

@@ -19,13 +19,16 @@
 
 #pragma once
 #include "common.hpp"
-#include <vector>
 #include "obs/gs/gs-mipmapper.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 #include "obs/gs/gs-vertexbuffer.hpp"
 #include "obs/obs-source-factory.hpp"
 
+#include "warning-disable.hpp"
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::filter::transform {
 	enum class transform_mode {
 		ORTHOGRAPHIC = 0,

source/filters/filter-upscaling.cpp

@@ -19,11 +19,14 @@
 // SOFTWARE.
 
 #include "filter-upscaling.hpp"
-#include <algorithm>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-upscaling.hpp

@@ -19,9 +19,6 @@
 // SOFTWARE.
 
 #pragma once
-#include <atomic>
-#include <memory>
-#include <mutex>
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
@@ -29,6 +26,12 @@
 #include "plugin.hpp"
 #include "util/util-threadpool.hpp"
 
+#include "warning-disable.hpp"
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef ENABLE_FILTER_UPSCALING_NVIDIA
 #include "nvidia/vfx/nvidia-vfx-superresolution.hpp"
 #endif

source/filters/filter-virtual-greenscreen.cpp

@@ -19,11 +19,14 @@
 // SOFTWARE.
 
 #include "filter-virtual-greenscreen.hpp"
-#include <algorithm>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/filters/filter-virtual-greenscreen.hpp

@@ -19,9 +19,6 @@
 // SOFTWARE.
 
 #pragma once
-#include <atomic>
-#include <memory>
-#include <mutex>
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
@@ -29,6 +26,12 @@
 #include "plugin.hpp"
 #include "util/util-threadpool.hpp"
 
+#include "warning-disable.hpp"
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef ENABLE_FILTER_VIRTUAL_GREENSCREEN_NVIDIA
 #include "nvidia/vfx/nvidia-vfx-greenscreen.hpp"
 #endif

source/gfx/blur/gfx-blur-base.cpp

@@ -16,7 +16,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-base.hpp"
+
+#include "warning-disable.hpp"
 #include <stdexcept>
+#include "warning-enable.hpp"
 
 void streamfx::gfx::blur::base::set_step_scale_x(double_t v)
 {

source/gfx/blur/gfx-blur-box-linear.cpp

@@ -17,11 +17,14 @@
 
 #include "gfx-blur-box-linear.hpp"
 #include "common.hpp"
+#include "obs/gs/gs-helper.hpp"
+#include "plugin.hpp"
+
+#include "warning-disable.hpp"
 #include <cmath>
 #include <memory>
 #include <stdexcept>
-#include "obs/gs/gs-helper.hpp"
+#include "warning-enable.hpp"
-#include "plugin.hpp"
 
 #define ST_MAX_BLUR_SIZE 128 // Also change this in box-linear.effect if modified.
 

source/gfx/blur/gfx-blur-box-linear.hpp

@@ -17,12 +17,15 @@
 
 #pragma once
 #include "common.hpp"
-#include <mutex>
 #include "gfx-blur-base.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace blur {
 		class box_linear_data {

source/gfx/blur/gfx-blur-box.cpp

@@ -17,11 +17,14 @@
 
 #include "gfx-blur-box.hpp"
 #include "common.hpp"
+#include "obs/gs/gs-helper.hpp"
+#include "plugin.hpp"
+
+#include "warning-disable.hpp"
 #include <cmath>
 #include <memory>
 #include <stdexcept>
-#include "obs/gs/gs-helper.hpp"
+#include "warning-enable.hpp"
-#include "plugin.hpp"
 
 #define ST_MAX_BLUR_SIZE 128 // Also change this in box.effect if modified.
 

source/gfx/blur/gfx-blur-box.hpp

@@ -17,12 +17,15 @@
 
 #pragma once
 #include "common.hpp"
-#include <mutex>
 #include "gfx-blur-base.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace blur {
 		class box_data {

source/gfx/blur/gfx-blur-dual-filtering.cpp

@@ -17,11 +17,14 @@
 
 #include "gfx-blur-dual-filtering.hpp"
 #include "common.hpp"
-#include <algorithm>
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 // Dual Filtering Blur
 //
 // This type of Blur uses downsampling and upsampling and clever math. That makes it less

source/gfx/blur/gfx-blur-dual-filtering.hpp

@@ -17,13 +17,16 @@
 
 #pragma once
 #include "common.hpp"
-#include <mutex>
-#include <vector>
 #include "gfx-blur-base.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace blur {
 		class dual_filtering_data {

source/gfx/blur/gfx-blur-gaussian-linear.cpp

@@ -17,9 +17,12 @@
 
 #include "gfx-blur-gaussian-linear.hpp"
 #include "common.hpp"
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 // FIXME: This breaks when MAX_KERNEL_SIZE is changed, due to the way the Gaussian
 //  function first goes up at the point, and then once we pass the critical point
 //  will go down again and it is not handled well. This is a pretty basic

source/gfx/blur/gfx-blur-gaussian-linear.hpp

@@ -17,13 +17,16 @@
 
 #pragma once
 #include "common.hpp"
-#include <mutex>
-#include <vector>
 #include "gfx-blur-base.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace blur {
 		class gaussian_linear_data {

source/gfx/blur/gfx-blur-gaussian.cpp

@@ -17,11 +17,14 @@
 
 #include "gfx-blur-gaussian.hpp"
 #include "common.hpp"
-#include <algorithm>
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 // TODO: It may be possible to optimize to run much faster: https://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 
 #define ST_KERNEL_SIZE 128u

source/gfx/blur/gfx-blur-gaussian.hpp

@@ -17,13 +17,16 @@
 
 #pragma once
 #include "common.hpp"
-#include <mutex>
-#include <vector>
 #include "gfx-blur-base.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace blur {
 		class gaussian_data {

source/gfx/gfx-debug.cpp

@@ -19,12 +19,15 @@
 // SOFTWARE.
 
 #include "gfx-debug.hpp"
-#include <mutex>
 #include "graphics/matrix4.h"
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/gfx/gfx-debug.hpp

@@ -18,10 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <memory>
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-vertexbuffer.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	class debug {
 		std::shared_ptr<::streamfx::obs::gs::effect>        _effect;

source/gfx/gfx-opengl.cpp

@@ -19,21 +19,15 @@
 // SOFTWARE.
 
 #include "gfx-opengl.hpp"
-#include <mutex>
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 // OpenGL
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include "glad/gl.h"
 #ifdef D_PLATFORM_WINDOWS
 #include "glad/wgl.h"
@@ -41,11 +35,7 @@
 #ifdef D_PLATFORM_LINUX
 #include "glad/glx.h"
 #endif
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "

source/gfx/gfx-opengl.hpp

@@ -18,7 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include "warning-disable.hpp"
 #include <memory>
+#include "warning-enable.hpp"
 
 namespace streamfx::gfx {
 	class opengl {

source/gfx/gfx-source-texture.cpp

@@ -16,10 +16,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-source-texture.hpp"
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "obs/obs-tools.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 streamfx::gfx::source_texture::~source_texture()
 {
 	if (_child && _parent) {

source/gfx/gfx-source-texture.hpp

@@ -17,11 +17,14 @@
 
 #pragma once
 #include "common.hpp"
-#include <map>
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
 #include "obs/obs-weak-source.hpp"
 
+#include "warning-disable.hpp"
+#include <map>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	class source_texture {
 		streamfx::obs::source _parent;

source/gfx/lut/gfx-lut-consumer.cpp

@@ -19,7 +19,6 @@
 // SOFTWARE.
 
 #include "gfx-lut-consumer.hpp"
-
 #include "obs/gs/gs-helper.hpp"
 
 streamfx::gfx::lut::consumer::consumer()

source/gfx/lut/gfx-lut-consumer.hpp

@@ -19,12 +19,14 @@
 // SOFTWARE.
 
 #pragma once
-#include <memory>
-
 #include "gfx-lut.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx::lut {
 	class consumer {
 		std::shared_ptr<streamfx::gfx::lut::data> _data;

source/gfx/lut/gfx-lut-producer.hpp

@@ -19,11 +19,12 @@
 // SOFTWARE.
 
 #pragma once
+#include "warning-disable.hpp"
 #include <memory>
-
 #include "gfx-lut.hpp"
 #include "obs/gs/gs-effect.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
+#include "warning-enable.hpp"
 
 namespace streamfx::gfx::lut {
 	class producer {

source/gfx/lut/gfx-lut.cpp

@@ -19,11 +19,14 @@
 // SOFTWARE.
 
 #include "gfx-lut.hpp"
-#include <mutex>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/gfx/lut/gfx-lut.hpp

@@ -19,10 +19,12 @@
 // SOFTWARE.
 
 #pragma once
-#include <memory>
-
 #include "obs/gs/gs-effect.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx::lut {
 	class data {
 		std::shared_ptr<streamfx::obs::gs::effect> _producer_effect;

source/gfx/shader/gfx-shader-param-basic.cpp

@@ -17,10 +17,13 @@
 
 #include "gfx-shader-param-basic.hpp"
 #include "strings.hpp"
+
+#include "warning-disable.hpp"
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <stdexcept>
+#include "warning-enable.hpp"
 
 static const std::string_view _annotation_field_type      = "field_type";
 static const std::string_view _annotation_suffix          = "suffix";

source/gfx/shader/gfx-shader-param-basic.hpp

@@ -17,10 +17,13 @@
 
 #pragma once
 #include "common.hpp"
-#include <vector>
 #include "gfx-shader-param.hpp"
 #include "obs/gs/gs-effect-parameter.hpp"
 
+#include "warning-disable.hpp"
+#include <vector>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace shader {
 		enum class basic_field_type {

source/gfx/shader/gfx-shader-param-texture.cpp

@@ -17,15 +17,18 @@
 
 #include "gfx-shader-param-texture.hpp"
 #include "strings.hpp"
-#include <map>
-#include <sstream>
-#include <stdexcept>
 #include "gfx-shader.hpp"
 #include "gfx/gfx-debug.hpp"
 #include "obs/gs/gs-helper.hpp"
 #include "obs/obs-source-tracker.hpp"
 #include "util/util-platform.hpp"
 
+#include "warning-disable.hpp"
+#include <map>
+#include <sstream>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 // TODO:
 // - FFT Audio Conversion
 // - FFT Variable Size...

source/gfx/shader/gfx-shader-param-texture.hpp

@@ -1,8 +1,6 @@
 
 #pragma once
 #include "common.hpp"
-#include <chrono>
-#include <mutex>
 #include "gfx-shader-param.hpp"
 #include "obs/gs/gs-rendertarget.hpp"
 #include "obs/gs/gs-texture.hpp"
@@ -12,6 +10,11 @@
 #include "obs/obs-tools.hpp"
 #include "obs/obs-weak-source.hpp"
 
+#include "warning-disable.hpp"
+#include <chrono>
+#include <mutex>
+#include "warning-enable.hpp"
+
 namespace streamfx::gfx {
 	namespace shader {
 		enum class texture_field_type {

source/gfx/shader/gfx-shader-param.cpp

@@ -16,11 +16,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-shader-param.hpp"
-#include <algorithm>
-#include <sstream>
 #include "gfx-shader-param-basic.hpp"
 #include "gfx-shader-param-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <sstream>
+#include "warning-enable.hpp"
+
 #define ST_ANNO_ORDER "order"
 #define ST_ANNO_VISIBILITY "visible"
 #define ST_ANNO_AUTOMATIC "automatic"

source/gfx/shader/gfx-shader-param.hpp

@@ -16,9 +16,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #pragma once
+#include "obs/gs/gs-effect-parameter.hpp"
+
+#include "warning-disable.hpp"
 #include <list>
 #include <string>
-#include "obs/gs/gs-effect-parameter.hpp"
+#include "warning-enable.hpp"
 
 namespace streamfx::gfx {
 	namespace shader {

source/gfx/shader/gfx-shader.cpp

@@ -16,13 +16,16 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-shader.hpp"
-#include <algorithm>
-#include <cstdio>
-#include <cstring>
 #include "obs/gs/gs-helper.hpp"
 #include "obs/obs-tools.hpp"
 #include "plugin.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+#include "warning-enable.hpp"
+
 #define ST_I18N "Shader"
 #define ST_I18N_REFRESH ST_I18N ".Refresh"
 #define ST_KEY_REFRESH "Shader.Refresh"

source/gfx/shader/gfx-shader.hpp

@@ -17,13 +17,16 @@
 
 #pragma once
 #include "common.hpp"
+#include "gfx/shader/gfx-shader-param.hpp"
+#include "obs/gs/gs-effect.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+
+#include "warning-disable.hpp"
 #include <filesystem>
 #include <list>
 #include <map>
 #include <random>
-#include "gfx/shader/gfx-shader-param.hpp"
+#include "warning-enable.hpp"
-#include "obs/gs/gs-effect.hpp"
-#include "obs/gs/gs-rendertarget.hpp"
 
 namespace streamfx::gfx {
 	namespace shader {

source/nvidia/ar/nvidia-ar-facedetection.cpp

@@ -18,11 +18,14 @@
  */
 
 #include "nvidia-ar-facedetection.hpp"
-#include <algorithm>
-#include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <algorithm>
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/nvidia/ar/nvidia-ar-feature.hpp

@@ -19,13 +19,16 @@
 // SOFTWARE.
 
 #pragma once
-#include <string_view>
 #include "nvidia/ar/nvidia-ar.hpp"
 #include "nvidia/cuda/nvidia-cuda-obs.hpp"
 #include "nvidia/cv/nvidia-cv-image.hpp"
 #include "nvidia/cv/nvidia-cv-texture.hpp"
 #include "nvidia/cv/nvidia-cv.hpp"
 
+#include "warning-disable.hpp"
+#include <string_view>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::ar {
 	class feature {
 		protected:

source/nvidia/ar/nvidia-ar.cpp

@@ -19,13 +19,16 @@
 // SOFTWARE.
 
 #include "nvidia-ar.hpp"
-#include <filesystem>
-#include <mutex>
 #include "nvidia/cuda/nvidia-cuda-obs.hpp"
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 #include "util/util-platform.hpp"
 
+#include "warning-disable.hpp"
+#include <filesystem>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)
@@ -41,24 +44,11 @@
 #endif
 
 #ifdef WIN32
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <Windows.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 
 #define ST_LIBRARY_NAME "nvARPose.dll"
 #else

source/nvidia/ar/nvidia-ar.hpp

@@ -19,9 +19,12 @@
 // SOFTWARE.
 
 #pragma once
-#include <cinttypes>
 #include "nvidia/cv/nvidia-cv.hpp"
 
+#include "warning-disable.hpp"
+#include <cinttypes>
+#include "warning-enable.hpp"
+
 #define P_NVAR_DEFINE_FUNCTION(name, ...)                           \
 	private:                                                        \
 	typedef ::streamfx::nvidia::cv::result (*t##name)(__VA_ARGS__); \

source/nvidia/cuda/nvidia-cuda-context.cpp

@@ -18,9 +18,12 @@
  */
 
 #include "nvidia-cuda-context.hpp"
+#include "util/util-logging.hpp"
+
+#include "warning-disable.hpp"
 #include <cassert>
 #include <stdexcept>
-#include "util/util-logging.hpp"
+#include "warning-enable.hpp"
 
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
@@ -37,22 +40,9 @@
 #endif
 
 #ifdef WIN32
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <atlutil.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 #endif
 
 #define ENABLE_STACK_CHECKS

source/nvidia/cuda/nvidia-cuda-context.hpp

@@ -18,9 +18,12 @@
  */
 
 #pragma once
-#include <memory>
 #include "nvidia-cuda.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cuda {
 	class context_stack;
 

source/nvidia/cuda/nvidia-cuda-gs-texture.hpp

@@ -18,12 +18,15 @@
  */
 
 #pragma once
-#include <cstddef>
-#include <memory>
 #include "nvidia-cuda-stream.hpp"
 #include "nvidia-cuda.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <cstddef>
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cuda {
 	class gstexture {
 		std::shared_ptr<::streamfx::nvidia::cuda::cuda> _cuda;

source/nvidia/cuda/nvidia-cuda-memory.cpp

@@ -18,9 +18,12 @@
  */
 
 #include "nvidia-cuda-memory.hpp"
-#include <stdexcept>
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/nvidia/cuda/nvidia-cuda-memory.hpp

@@ -18,9 +18,12 @@
  */
 
 #pragma once
+#include "nvidia-cuda.hpp"
+
+#include "warning-disable.hpp"
 #include <cstddef>
 #include <memory>
-#include "nvidia-cuda.hpp"
+#include "warning-enable.hpp"
 
 namespace streamfx::nvidia::cuda {
 	class memory {

source/nvidia/cuda/nvidia-cuda-obs.hpp

@@ -18,11 +18,14 @@
  */
 
 #pragma once
-#include <memory>
 #include "nvidia-cuda-context.hpp"
 #include "nvidia-cuda-stream.hpp"
 #include "nvidia-cuda.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cuda {
 	class obs {
 		std::shared_ptr<::streamfx::nvidia::cuda::cuda>    _cuda;

source/nvidia/cuda/nvidia-cuda-stream.cpp

@@ -18,9 +18,12 @@
  */
 
 #include "nvidia-cuda-stream.hpp"
-#include <stdexcept>
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <stdexcept>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/nvidia/cuda/nvidia-cuda-stream.hpp

@@ -18,9 +18,12 @@
  */
 
 #pragma once
-#include <memory>
 #include "nvidia-cuda.hpp"
 
+#include "warning-disable.hpp"
+#include <memory>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cuda {
 	class stream {
 		std::shared_ptr<::streamfx::nvidia::cuda::cuda> _cuda;

source/nvidia/cuda/nvidia-cuda.cpp

@@ -18,9 +18,12 @@
  */
 
 #include "nvidia-cuda.hpp"
-#include <mutex>
 #include "util/util-logging.hpp"
 
+#include "warning-disable.hpp"
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)

source/nvidia/cuda/nvidia-cuda.hpp

@@ -18,29 +18,19 @@
  */
 
 #pragma once
-#include <cstddef>
-#include <tuple>
 #include "util/util-bitmask.hpp"
 #include "util/util-library.hpp"
 
+#include "warning-disable.hpp"
+#include <cstddef>
+#include <tuple>
+#include "warning-enable.hpp"
+
 #ifdef WIN32
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <d3d11.h>
 #include <dxgi.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 #endif
 
 #define P_CUDA_DEFINE_FUNCTION(name, ...)                             \

source/nvidia/cv/nvidia-cv-image.hpp

@@ -19,9 +19,12 @@
 // SOFTWARE.
 
 #pragma once
-#include <cinttypes>
 #include "nvidia/cv/nvidia-cv.hpp"
 
+#include "warning-disable.hpp"
+#include <cinttypes>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cv {
 	using ::streamfx::nvidia::cv::component_layout;
 	using ::streamfx::nvidia::cv::component_type;

source/nvidia/cv/nvidia-cv-texture.hpp

@@ -19,10 +19,13 @@
 // SOFTWARE.
 
 #pragma once
-#include <cinttypes>
 #include "nvidia/cv/nvidia-cv-image.hpp"
 #include "obs/gs/gs-texture.hpp"
 
+#include "warning-disable.hpp"
+#include <cinttypes>
+#include "warning-enable.hpp"
+
 namespace streamfx::nvidia::cv {
 	using ::streamfx::nvidia::cv::component_layout;
 	using ::streamfx::nvidia::cv::component_type;

source/nvidia/cv/nvidia-cv.cpp

@@ -23,13 +23,16 @@
 // - NVIDIA Augmented Reality SDK
 
 #include "nvidia-cv.hpp"
-#include <filesystem>
-#include <mutex>
 #include "nvidia/cuda/nvidia-cuda-obs.hpp"
 #include "obs/gs/gs-helper.hpp"
 #include "util/util-logging.hpp"
 #include "util/util-platform.hpp"
 
+#include "warning-disable.hpp"
+#include <filesystem>
+#include <mutex>
+#include "warning-enable.hpp"
+
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "
 #define D_LOG_ERROR(x, ...) P_LOG_ERROR(ST_PREFIX##x, __FUNCTION_SIG__, __VA_ARGS__)
@@ -45,24 +48,11 @@
 #endif
 
 #if defined(WIN32)
-#ifdef _MSC_VER
+#include "warning-disable.hpp"
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <Windows.h>
-#ifdef _MSC_VER
+#include "warning-enable.hpp"
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 
 #define LIB_NAME "NVCVImage.dll"
 #else

source/nvidia/cv/nvidia-cv.hpp

@@ -19,30 +19,17 @@
 // SOFTWARE.
 
 #pragma once
-#include <cinttypes>
 #include "nvidia/cuda/nvidia-cuda.hpp"
 #include "util/util-bitmask.hpp"
 #include "util/util-library.hpp"
 
+#include "warning-disable.hpp"
+#include <cinttypes>
 #ifdef WIN32
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4464)
-#pragma warning(disable : 4820)
-#pragma warning(disable : 5220)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
 #include <d3d11.h>
 #include <dxgi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
 #endif
+#include "warning-enable.hpp"
 
 #define NVCVI_DEFINE_FUNCTION(name, ...)                                   \
 	private:                                                               \