diff options
| author | Zoltan Kovago <zoltan.kovago@tresorit.com> | 2018-04-06 19:38:52 +0300 |
|---|---|---|
| committer | Zoltan Kovago <zoltan.kovago@tresorit.com> | 2018-04-09 16:47:17 +0300 |
| commit | 0fdd8040ce4eec4522e62a955de00cf8a9a4f66b (patch) | |
| tree | 0fe8151d8813d50043f753b761ae1ed9cccff786 /include/rapidjson/writer.h | |
| parent | 8022a5f79c7490e2a9dd5934ac9c77b6d5555a6d (diff) | |
fix compilation on windows with clang
Diffstat (limited to 'include/rapidjson/writer.h')
| -rw-r--r-- | include/rapidjson/writer.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h index a9788915..49cc0fb4 100644 --- a/include/rapidjson/writer.h +++ b/include/rapidjson/writer.h @@ -36,16 +36,14 @@ #include <arm_neon.h> #endif -#ifdef _MSC_VER -RAPIDJSON_DIAG_PUSH -RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant -#endif - #ifdef __clang__ RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_OFF(padded) RAPIDJSON_DIAG_OFF(unreachable-code) RAPIDJSON_DIAG_OFF(c++98-compat) +#elif defined(_MSC_VER) +RAPIDJSON_DIAG_PUSH +RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant #endif RAPIDJSON_NAMESPACE_BEGIN @@ -705,11 +703,7 @@ inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, siz RAPIDJSON_NAMESPACE_END -#ifdef _MSC_VER -RAPIDJSON_DIAG_POP -#endif - -#ifdef __clang__ +#if defined(_MSC_VER) || defined(__clang__) RAPIDJSON_DIAG_POP #endif |