mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert pragma warnings

Browse Source
This commit is contained in:
Alexander Bock
2022-07-11 14:26:13 +02:00
parent 068013bea3
commit 10ec6d3013
9 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/json.h
View File

@@ -30,13 +30,17 @@
#pragma warning (disable : 4706) // assignment within conditional expression
#endif // WIN32
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
#pragma GCC diagnostic ignored "-Wuseless-cast"
#endif // __GNUC__
#include <json/json.hpp>
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif // __GNUC__
#ifdef WIN32
#pragma warning (pop)

7
include/openspace/util/spicemanager.h
View File

@@ -36,17 +36,22 @@
#include <vector>
#include <set>
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#include "SpiceUsr.h"
#include "SpiceZpr.h"
#ifdef __clang__
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
namespace openspace {