amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-09 07:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Niels Lohmann committed 2021-08-06 13:23:26 +02:00
2 parents 7c19aa2210 359f6723fc
commit 5c38e76c11
10 files changed
+18 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/src/unit-cbor.cpp
-1
View File
@@ -28,7 +28,6 @@ SOFTWARE.
*/
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
#include <nlohmann/json.hpp>
using nlohmann::json;
test/src/unit-constructor1.cpp
-1
View File
@@ -28,7 +28,6 @@ SOFTWARE.
*/
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
#define JSON_TESTS_PRIVATE
#include <nlohmann/json.hpp>
test/src/unit-readme.cpp
-1
View File
@@ -28,7 +28,6 @@ SOFTWARE.
*/
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
#include <nlohmann/json.hpp>
using nlohmann::json;
test/src/unit-reference_access.cpp
-1
View File
@@ -28,7 +28,6 @@ SOFTWARE.
*/
#include "doctest_compatibility.h"
DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
#include <nlohmann/json.hpp>
using nlohmann::json;
test/src/unit-regression1.cpp
-1
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>
test/src/unit-regression2.cpp
-1
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>