diff options
Diffstat (limited to 'include/rapidjson/reader.h')
| -rw-r--r-- | include/rapidjson/reader.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/rapidjson/reader.h b/include/rapidjson/reader.h index 084efaa..e6a696c 100644 --- a/include/rapidjson/reader.h +++ b/include/rapidjson/reader.h @@ -37,17 +37,15 @@ #include <arm_neon.h> #endif -#ifdef _MSC_VER -RAPIDJSON_DIAG_PUSH -RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant -RAPIDJSON_DIAG_OFF(4702) // unreachable code -#endif - #ifdef __clang__ RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_OFF(old-style-cast) RAPIDJSON_DIAG_OFF(padded) RAPIDJSON_DIAG_OFF(switch-enum) +#elif defined(_MSC_VER) +RAPIDJSON_DIAG_PUSH +RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant +RAPIDJSON_DIAG_OFF(4702) // unreachable code #endif #ifdef __GNUC__ @@ -2206,7 +2204,7 @@ typedef GenericReader<UTF8<>, UTF8<> > Reader; RAPIDJSON_NAMESPACE_END -#ifdef __clang__ +#if defined(__clang__) || defined(_MSC_VER) RAPIDJSON_DIAG_POP #endif @@ -2215,8 +2213,4 @@ RAPIDJSON_DIAG_POP RAPIDJSON_DIAG_POP #endif -#ifdef _MSC_VER -RAPIDJSON_DIAG_POP -#endif - #endif // RAPIDJSON_READER_H_ |