Skip to content

R
rapidjson
Commit 04f9c502 authored by Philipp A. Hartmann's avatar Philipp A. Hartmann Committed by Philipp A. Hartmann
Browse files
Options

encodings.h: hide narrowing conversion warnings on MSVC

parent e63125f1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
include/rapidjson/encodings.h
View file @ 04f9c502
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
#include "rapidjson.h" #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_PUSH
RAPIDJSON_DIAG_OFF(effc++) RAPIDJSON_DIAG_OFF(effc++)
#endif #endif
...@@ -529,7 +532,7 @@ struct Transcoder<Encoding, Encoding> { ...@@ -529,7 +532,7 @@ struct Transcoder<Encoding, Encoding> {
} // namespace rapidjson } // namespace rapidjson
#ifdef __GNUC__ #if defined(__GNUC__) || defined(_MSV_VER)
RAPIDJSON_DIAG_POP RAPIDJSON_DIAG_POP
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment