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/encodings.h | |
| parent | 8022a5f79c7490e2a9dd5934ac9c77b6d5555a6d (diff) | |
fix compilation on windows with clang
Diffstat (limited to 'include/rapidjson/encodings.h')
| -rw-r--r-- | include/rapidjson/encodings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rapidjson/encodings.h b/include/rapidjson/encodings.h index 7903e76a..12b562ac 100644 --- a/include/rapidjson/encodings.h +++ b/include/rapidjson/encodings.h @@ -17,7 +17,7 @@ #include "rapidjson.h" -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data RAPIDJSON_DIAG_OFF(4702) // unreachable code @@ -709,7 +709,7 @@ struct Transcoder<Encoding, Encoding> { RAPIDJSON_NAMESPACE_END -#if defined(__GNUC__) || defined(_MSC_VER) +#if defined(__GNUC__) || (defined(_MSC_VER) && !defined(__clang__)) RAPIDJSON_DIAG_POP #endif |