mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 13:30:06 +00:00
Guard pragma warning statements with ifdef msvc
This commit is contained in:
parent
ec45e0bce0
commit
509fc76653
12 changed files with 100 additions and 28 deletions
|
|
@ -2,12 +2,18 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,9 +2,15 @@
|
|||
#include <scwx/qt/gl/shader_program.hpp>
|
||||
#include <scwx/util/logger.hpp>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@
|
|||
#include <scwx/qt/gl/shader_program.hpp>
|
||||
#include <scwx/util/logger.hpp>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@
|
|||
#include <chrono>
|
||||
#include <execution>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <boost/date_time.hpp>
|
||||
#include <boost/date_time/local_time/local_time.hpp>
|
||||
#include <boost/timer/timer.hpp>
|
||||
|
|
@ -18,7 +21,10 @@
|
|||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <imgui.h>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,13 +4,19 @@
|
|||
|
||||
#include <execution>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <boost/timer/timer.hpp>
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 <freetype-gl.h> (exclude opengl.h)
|
||||
#include <platform.h>
|
||||
#include <vec234.h>
|
||||
|
|
@ -30,7 +33,10 @@
|
|||
#include <texture-atlas.h>
|
||||
#include <texture-font.h>
|
||||
#include <ftgl-utils.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
# include <WinSock2.h>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,19 @@
|
|||
#include <shared_mutex>
|
||||
#include <unordered_map>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#pragma warning(disable : 4714)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
# pragma warning(disable : 4714)
|
||||
#endif
|
||||
|
||||
#include <boost/gil/extension/io/png.hpp>
|
||||
#include <boost/iostreams/stream.hpp>
|
||||
#include <stb_rect_pack.h>
|
||||
#include <QFile>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,9 +3,15 @@
|
|||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <spdlog/logger.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,11 +3,17 @@
|
|||
#include <scwx/network/dir_list.hpp>
|
||||
#include <scwx/util/logger.hpp>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#include <boost/algorithm/string/trim.hpp>
|
||||
#include <cpr/cpr.h>
|
||||
#include <libxml/HTMLparser.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,11 +6,17 @@
|
|||
#include <regex>
|
||||
#include <shared_mutex>
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push, 0)
|
||||
#endif
|
||||
|
||||
#define LIBXML_HTML_ENABLED
|
||||
#include <cpr/cpr.h>
|
||||
#include <libxml/HTMLparser.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,12 +5,18 @@
|
|||
|
||||
#include <fstream>
|
||||
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4706)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4706)
|
||||
#endif
|
||||
|
||||
#include <boost/iostreams/copy.hpp>
|
||||
#include <boost/iostreams/filtering_streambuf.hpp>
|
||||
#include <boost/iostreams/filter/zlib.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
@ -39,7 +45,7 @@ public:
|
|||
Level3File::Level3File() : p(std::make_unique<Level3FileImpl>()) {}
|
||||
Level3File::~Level3File() = default;
|
||||
|
||||
Level3File::Level3File(Level3File&&) noexcept = default;
|
||||
Level3File::Level3File(Level3File&&) noexcept = default;
|
||||
Level3File& Level3File::operator=(Level3File&&) noexcept = default;
|
||||
|
||||
std::shared_ptr<awips::WmoHeader> Level3File::wmo_header() const
|
||||
|
|
|
|||
|
|
@ -6,12 +6,18 @@
|
|||
#include <fstream>
|
||||
#include <sstream>
|
||||
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4706)
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4706)
|
||||
#endif
|
||||
|
||||
#include <boost/iostreams/copy.hpp>
|
||||
#include <boost/iostreams/filtering_streambuf.hpp>
|
||||
#include <boost/iostreams/filter/gzip.hpp>
|
||||
#pragma warning(pop)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
namespace scwx
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue