From 04f9c5020f29592d6a9e45baf1c74071c6ab3b8a Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Thu, 10 Jul 2014 18:12:46 +0200 Subject: [PATCH] encodings.h: hide narrowing conversion warnings on MSVC --- include/rapidjson/encodings.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/rapidjson/encodings.h b/include/rapidjson/encodings.h index 9e1623d..dcf21e4 100644 --- a/include/rapidjson/encodings.h +++ b/include/rapidjson/encodings.h @@ -3,7 +3,10 @@ #include "rapidjson.h" -#ifdef __GNUC__ +#ifdef _MSC_VER +RAPIDJSON_DIAG_PUSH +RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data +#elif defined(__GNUC__) RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_OFF(effc++) #endif @@ -529,7 +532,7 @@ struct Transcoder { } // namespace rapidjson -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(_MSV_VER) RAPIDJSON_DIAG_POP #endif