External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 260c1563bf into 4c4f60f438

Browse Source
This commit is contained in:
AraHaan 2017-11-06 19:37:32 +00:00 committed by GitHub
commit 363b01ccea
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/json.hpp
View File

@ -116,6 +116,19 @@ SOFTWARE.
#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
#define JSON_HAS_CPP_14
#endif
/*
In Visual Studio 2017 there are warnings on min
and max in this header having not enough args.
This is because in C min and max take args and
well are not needed anyway so we undefine them
first to silence these annoying warnings!!!
*/
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
/*!
@brief namespace for Niels Lohmann