Skip to content

Commit e6043e5

Browse files
Tweaking compiler pragmas yet again.
1 parent b3f359f commit e6043e5

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

include/_clang_include_prefix.hpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
#pragma clang diagnostic push
2-
3-
#pragma clang diagnostic ignored "-Wunknown-pragmas"
4-
5-
#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
6-
#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
7-
#pragma clang diagnostic ignored "-Wc++98-compat"
8-
#pragma clang diagnostic ignored "-Wold-style-cast"
9-
#pragma clang diagnostic ignored "-Wpadded"
10-
#pragma clang diagnostic ignored "-Wreserved-identifier"
11-
#pragma clang diagnostic ignored "-Wshadow-field-in-constructor"
12-
#pragma clang diagnostic ignored "-Wshorten-64-to-32"
13-
#pragma clang diagnostic ignored "-Wsign-conversion"
14-
#pragma clang diagnostic ignored "-Wunused-parameter"
1+
#if __clang__
2+
#pragma clang diagnostic push
3+
#pragma clang diagnostic ignored "-Wunknown-pragmas"
4+
#pragma clang diagnostic ignored "-Wall"
5+
#elif __GNUC__ // must follow clang (which defines both)
6+
#pragma GCC diagnostic push
7+
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
8+
#pragma GCC diagnostic ignored "-Wall"
9+
#endif

include/_clang_include_suffix.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
#pragma clang diagnostic pop
1+
#if __clang__
2+
#pragma clang diagnostic pop
3+
#elif __GNUC__ // must follow clang (which defines both)
4+
#pragma GCC diagnostic pop
5+
#endif

0 commit comments

Comments
 (0)