encodings.h: hide narrowing conversion warnings on MSVC

04f9c502 · Philipp A. Hartmann · Philipp A. Hartmann · e63125f1 · 04f9c502
Commit 04f9c502 authored Jul 10, 2014 by Philipp A. Hartmann Committed by Philipp A. Hartmann Jul 10, 2014
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

encodings.h include/rapidjson/encodings.h +5 -2

No files found.
--- 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<Encoding, Encoding> {

 } // namespace rapidjson

-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(_MSV_VER)
 RAPIDJSON_DIAG_POP
 #endif