Merge branch 'develop' of https://github.com/nlohmann/json into issue2824

This commit is contained in:
Niels Lohmann
2021-08-11 08:06:32 +02:00
12 changed files with 59 additions and 7 deletions

View File

@@ -28,7 +28,6 @@ SOFTWARE.
*/
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
// for some reason including this after the json header leads to linker errors with VS 2017...
#include <locale>