From 52f4e4641f85432b78ec1f5537435cdd9d638995 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 14 Jan 2019 23:21:29 +0100 Subject: [PATCH] project: Additional #ifdef _MSC_VER checks --- source/gfx-effect-source.hpp | 4 ++++ source/gfx-source-texture.hpp | 4 ++++ source/gs-effect.hpp | 5 +++++ source/gs-helper.hpp | 4 ++++ source/gs-indexbuffer.hpp | 5 +++++ source/gs-mipmapper.hpp | 4 ++++ source/gs-rendertarget.hpp | 4 ++++ source/gs-sampler.hpp | 4 ++++ source/gs-texture.hpp | 4 ++++ source/gs-vertex.hpp | 4 ++++ source/gs-vertexbuffer.hpp | 4 ++++ source/obs-audio-capture.hpp | 4 ++++ source/obs-source.hpp | 4 ++++ source/obs-tools.hpp | 4 ++++ source/plugin.hpp | 5 +++++ source/source-mirror.hpp | 4 ++++ source/util-math.hpp | 4 ++++ 17 files changed, 71 insertions(+) diff --git a/source/gfx-effect-source.hpp b/source/gfx-effect-source.hpp index 13cc8f8..873a737 100644 --- a/source/gfx-effect-source.hpp +++ b/source/gfx-effect-source.hpp @@ -29,10 +29,14 @@ #include "gs-vertexbuffer.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif // Data Defines #define D_TYPE "CustomShader.Type" diff --git a/source/gfx-source-texture.hpp b/source/gfx-source-texture.hpp index 89d7768..6d137ae 100644 --- a/source/gfx-source-texture.hpp +++ b/source/gfx-source-texture.hpp @@ -23,10 +23,14 @@ #include "obs-source.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gfx { class source_texture { diff --git a/source/gs-effect.hpp b/source/gs-effect.hpp index aca249f..0587d2b 100644 --- a/source/gs-effect.hpp +++ b/source/gs-effect.hpp @@ -25,14 +25,19 @@ #include "gs-sampler.hpp" #include "gs-texture.hpp" +// OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include #include #include #include #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class effect_parameter { diff --git a/source/gs-helper.hpp b/source/gs-helper.hpp index f35f2c2..3c6be30 100644 --- a/source/gs-helper.hpp +++ b/source/gs-helper.hpp @@ -22,10 +22,14 @@ #include "plugin.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif gs_effect_param* gs_effect_get_param(gs_effect_t* effect, const char* name); bool gs_set_param_int(gs_effect_t* effect, const char* name, int value); diff --git a/source/gs-indexbuffer.hpp b/source/gs-indexbuffer.hpp index b8a6ae1..770f13d 100644 --- a/source/gs-indexbuffer.hpp +++ b/source/gs-indexbuffer.hpp @@ -21,10 +21,15 @@ #include #include +// OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class index_buffer : public std::vector { diff --git a/source/gs-mipmapper.hpp b/source/gs-mipmapper.hpp index dda42cd..2576d1f 100644 --- a/source/gs-mipmapper.hpp +++ b/source/gs-mipmapper.hpp @@ -24,10 +24,14 @@ #include "gs-vertexbuffer.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class mipmapper { diff --git a/source/gs-rendertarget.hpp b/source/gs-rendertarget.hpp index 9263ee2..4bc721c 100644 --- a/source/gs-rendertarget.hpp +++ b/source/gs-rendertarget.hpp @@ -23,10 +23,14 @@ #include "gs-texture.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class rendertarget_op; diff --git a/source/gs-sampler.hpp b/source/gs-sampler.hpp index ba2d824..210baf3 100644 --- a/source/gs-sampler.hpp +++ b/source/gs-sampler.hpp @@ -21,10 +21,14 @@ #include // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class sampler { diff --git a/source/gs-texture.hpp b/source/gs-texture.hpp index 5c65431..92cff6b 100644 --- a/source/gs-texture.hpp +++ b/source/gs-texture.hpp @@ -23,10 +23,14 @@ #include "utility.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class texture { diff --git a/source/gs-vertex.hpp b/source/gs-vertex.hpp index 7cfa362..1737591 100644 --- a/source/gs-vertex.hpp +++ b/source/gs-vertex.hpp @@ -23,10 +23,14 @@ #include "gs-limits.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { struct vertex { diff --git a/source/gs-vertexbuffer.hpp b/source/gs-vertexbuffer.hpp index 2f1ecf6..9c0716d 100644 --- a/source/gs-vertexbuffer.hpp +++ b/source/gs-vertexbuffer.hpp @@ -25,10 +25,14 @@ #include "util-memory.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace gs { class vertex_buffer { diff --git a/source/obs-audio-capture.hpp b/source/obs-audio-capture.hpp index 2b8963f..a03f7f9 100644 --- a/source/obs-audio-capture.hpp +++ b/source/obs-audio-capture.hpp @@ -21,10 +21,14 @@ #include // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace obs { typedef std::function audio_capture_callback_t; diff --git a/source/obs-source.hpp b/source/obs-source.hpp index b515586..cd9b018 100644 --- a/source/obs-source.hpp +++ b/source/obs-source.hpp @@ -26,10 +26,14 @@ #include "util-event.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace obs { class source { diff --git a/source/obs-tools.hpp b/source/obs-tools.hpp index e39c197..05e1cc9 100644 --- a/source/obs-tools.hpp +++ b/source/obs-tools.hpp @@ -25,10 +25,14 @@ #include // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace obs { namespace tools { diff --git a/source/plugin.hpp b/source/plugin.hpp index d00a6f5..d66f6d4 100644 --- a/source/plugin.hpp +++ b/source/plugin.hpp @@ -22,11 +22,16 @@ #include #include +// OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include "obs-module.h" #include "util/platform.h" +#ifdef _MSC_VER #pragma warning(pop) +#endif // Plugin #define PLUGIN_NAME "Stream Effects" diff --git a/source/source-mirror.hpp b/source/source-mirror.hpp index 99c26d9..a751a9f 100644 --- a/source/source-mirror.hpp +++ b/source/source-mirror.hpp @@ -31,10 +31,14 @@ #include "plugin.hpp" // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include +#ifdef _MSC_VER #pragma warning(pop) +#endif namespace Source { class MirrorAddon { diff --git a/source/util-math.hpp b/source/util-math.hpp index bb44591..8dc1138 100644 --- a/source/util-math.hpp +++ b/source/util-math.hpp @@ -24,12 +24,16 @@ #include // OBS +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4201) +#endif #include #include #include +#ifdef _MSC_VER #pragma warning(pop) +#endif // Constants #define PI 3.1415926535897932384626433832795