From 509fc76653dcf3ec3343192e82445389cc85c79f Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 16 Apr 2023 01:02:56 -0500 Subject: [PATCH] Guard pragma warning statements with ifdef msvc --- scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/gl/text_shader.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/map/color_table_layer.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/map/overlay_layer.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/map/radar_product_layer.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/util/font.cpp | 10 ++++++++-- scwx-qt/source/scwx/qt/util/texture_atlas.cpp | 12 +++++++++--- wxdata/include/scwx/util/logger.hpp | 10 ++++++++-- wxdata/source/scwx/network/dir_list.cpp | 10 ++++++++-- wxdata/source/scwx/provider/warnings_provider.cpp | 10 ++++++++-- wxdata/source/scwx/wsr88d/level3_file.cpp | 14 ++++++++++---- wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp | 12 +++++++++--- 12 files changed, 100 insertions(+), 28 deletions(-) diff --git a/scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp b/scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp index 2fa4ec40..c15b1f6d 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp @@ -2,12 +2,18 @@ #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/scwx-qt/source/scwx/qt/gl/text_shader.cpp b/scwx-qt/source/scwx/qt/gl/text_shader.cpp index ec8cdcf1..c349597f 100644 --- a/scwx-qt/source/scwx/qt/gl/text_shader.cpp +++ b/scwx-qt/source/scwx/qt/gl/text_shader.cpp @@ -2,9 +2,15 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp index 81bd1847..8d8b5e6d 100644 --- a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp @@ -2,10 +2,16 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp index c21369d9..6fe192ae 100644 --- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp @@ -8,7 +8,10 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #include #include @@ -18,7 +21,10 @@ #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp index 377b09d0..84517975 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -4,13 +4,19 @@ #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #include #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/scwx-qt/source/scwx/qt/util/font.cpp b/scwx-qt/source/scwx/qt/util/font.cpp index a8786753..25ccc27d 100644 --- a/scwx-qt/source/scwx/qt/util/font.cpp +++ b/scwx-qt/source/scwx/qt/util/font.cpp @@ -22,7 +22,10 @@ #include FT_SFNT_NAMES_H #include FT_TRUETYPE_IDS_H -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + // #include (exclude opengl.h) #include #include @@ -30,7 +33,10 @@ #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif #ifdef WIN32 # include diff --git a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp index 5a7181c4..6aa87dd3 100644 --- a/scwx-qt/source/scwx/qt/util/texture_atlas.cpp +++ b/scwx-qt/source/scwx/qt/util/texture_atlas.cpp @@ -5,13 +5,19 @@ #include #include -#pragma warning(push, 0) -#pragma warning(disable : 4714) +#if defined(_MSC_VER) +# pragma warning(push, 0) +# pragma warning(disable : 4714) +#endif + #include #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/wxdata/include/scwx/util/logger.hpp b/wxdata/include/scwx/util/logger.hpp index 7c3e5119..cab97a42 100644 --- a/wxdata/include/scwx/util/logger.hpp +++ b/wxdata/include/scwx/util/logger.hpp @@ -3,9 +3,15 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/wxdata/source/scwx/network/dir_list.cpp b/wxdata/source/scwx/network/dir_list.cpp index 74e00ad4..625026c2 100644 --- a/wxdata/source/scwx/network/dir_list.cpp +++ b/wxdata/source/scwx/network/dir_list.cpp @@ -3,11 +3,17 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/wxdata/source/scwx/provider/warnings_provider.cpp b/wxdata/source/scwx/provider/warnings_provider.cpp index 462d22b8..a69bfbcb 100644 --- a/wxdata/source/scwx/provider/warnings_provider.cpp +++ b/wxdata/source/scwx/provider/warnings_provider.cpp @@ -6,11 +6,17 @@ #include #include -#pragma warning(push, 0) +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #define LIBXML_HTML_ENABLED #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { diff --git a/wxdata/source/scwx/wsr88d/level3_file.cpp b/wxdata/source/scwx/wsr88d/level3_file.cpp index 96d5d3a6..28ab53f5 100644 --- a/wxdata/source/scwx/wsr88d/level3_file.cpp +++ b/wxdata/source/scwx/wsr88d/level3_file.cpp @@ -5,12 +5,18 @@ #include -#pragma warning(push) -#pragma warning(disable : 4706) +#if defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4706) +#endif + #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx { @@ -39,7 +45,7 @@ public: Level3File::Level3File() : p(std::make_unique()) {} Level3File::~Level3File() = default; -Level3File::Level3File(Level3File&&) noexcept = default; +Level3File::Level3File(Level3File&&) noexcept = default; Level3File& Level3File::operator=(Level3File&&) noexcept = default; std::shared_ptr Level3File::wmo_header() const diff --git a/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp b/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp index ba4a13eb..f9ff6027 100644 --- a/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp +++ b/wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp @@ -6,12 +6,18 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 4706) +#if defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4706) +#endif + #include #include #include -#pragma warning(pop) + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif namespace scwx {