blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 03:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Guard pragma warning statements with ifdef msvc

Browse source
This commit is contained in:
Dan Paulat 2023-04-16 01:02:56 -05:00
parent ec45e0bce0
commit 509fc76653
12 changed files with 100 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/source/scwx/qt/gl/draw/draw_item.cpp
View file

@ -2,12 +2,18 @@
#include <string> #include <string>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <mbgl/util/constants.hpp> #include <mbgl/util/constants.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
scwx-qt/source/scwx/qt/gl/text_shader.cpp
View file

@ -2,9 +2,15 @@
#include <scwx/qt/gl/shader_program.hpp> #include <scwx/qt/gl/shader_program.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
scwx-qt/source/scwx/qt/map/color_table_layer.cpp
View file

@ -2,10 +2,16 @@
#include <scwx/qt/gl/shader_program.hpp> #include <scwx/qt/gl/shader_program.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
scwx-qt/source/scwx/qt/map/overlay_layer.cpp
View file

@ -8,7 +8,10 @@
#include <chrono> #include <chrono>
#include <execution> #include <execution>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <boost/date_time.hpp> #include <boost/date_time.hpp>
#include <boost/date_time/local_time/local_time.hpp> #include <boost/date_time/local_time/local_time.hpp>
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
@ -18,7 +21,10 @@
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <imgui.h> #include <imgui.h>
#include <mbgl/util/constants.hpp> #include <mbgl/util/constants.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
View file

@ -4,13 +4,19 @@
#include <execution> #include <execution>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <mbgl/util/constants.hpp> #include <mbgl/util/constants.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
scwx-qt/source/scwx/qt/util/font.cpp
View file

@ -22,7 +22,10 @@
#include FT_SFNT_NAMES_H #include FT_SFNT_NAMES_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
// #include <freetype-gl.h> (exclude opengl.h) // #include <freetype-gl.h> (exclude opengl.h)
#include <platform.h> #include <platform.h>
#include <vec234.h> #include <vec234.h>
@ -30,7 +33,10 @@
#include <texture-atlas.h> #include <texture-atlas.h>
#include <texture-font.h> #include <texture-font.h>
#include <ftgl-utils.h> #include <ftgl-utils.h>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
#ifdef WIN32 #ifdef WIN32
# include <WinSock2.h> # include <WinSock2.h>

6
scwx-qt/source/scwx/qt/util/texture_atlas.cpp
View file

@ -5,13 +5,19 @@
#include <shared_mutex> #include <shared_mutex>
#include <unordered_map> #include <unordered_map>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
# pragma warning(disable : 4714) # pragma warning(disable : 4714)
#endif
#include <boost/gil/extension/io/png.hpp> #include <boost/gil/extension/io/png.hpp>
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
#include <stb_rect_pack.h> #include <stb_rect_pack.h>
#include <QFile> #include <QFile>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
wxdata/include/scwx/util/logger.hpp
View file

@ -3,9 +3,15 @@
#include <memory> #include <memory>
#include <string> #include <string>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <spdlog/logger.h> #include <spdlog/logger.h>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
wxdata/source/scwx/network/dir_list.cpp
View file

@ -3,11 +3,17 @@
#include <scwx/network/dir_list.hpp> #include <scwx/network/dir_list.hpp>
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <cpr/cpr.h> #include <cpr/cpr.h>
#include <libxml/HTMLparser.h> #include <libxml/HTMLparser.h>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
wxdata/source/scwx/provider/warnings_provider.cpp
View file

@ -6,11 +6,17 @@
#include <regex> #include <regex>
#include <shared_mutex> #include <shared_mutex>
#if defined(_MSC_VER)
# pragma warning(push, 0) # pragma warning(push, 0)
#endif
#define LIBXML_HTML_ENABLED #define LIBXML_HTML_ENABLED
#include <cpr/cpr.h> #include <cpr/cpr.h>
#include <libxml/HTMLparser.h> #include <libxml/HTMLparser.h>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
wxdata/source/scwx/wsr88d/level3_file.cpp
View file

@ -5,12 +5,18 @@
#include <fstream> #include <fstream>
#if defined(_MSC_VER)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4706) # pragma warning(disable : 4706)
#endif
#include <boost/iostreams/copy.hpp> #include <boost/iostreams/copy.hpp>
#include <boost/iostreams/filtering_streambuf.hpp> #include <boost/iostreams/filtering_streambuf.hpp>
#include <boost/iostreams/filter/zlib.hpp> #include <boost/iostreams/filter/zlib.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {

6
wxdata/source/scwx/wsr88d/nexrad_file_factory.cpp
View file

@ -6,12 +6,18 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#if defined(_MSC_VER)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4706) # pragma warning(disable : 4706)
#endif
#include <boost/iostreams/copy.hpp> #include <boost/iostreams/copy.hpp>
#include <boost/iostreams/filtering_streambuf.hpp> #include <boost/iostreams/filtering_streambuf.hpp>
#include <boost/iostreams/filter/gzip.hpp> #include <boost/iostreams/filter/gzip.hpp>
#if defined(_MSC_VER)
# pragma warning(pop) # pragma warning(pop)
#endif
namespace scwx namespace scwx
{ {