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

2026-03-02 07:16:24 +00:00 · 2021-08-06 13:23:26 +02:00
parent 7c19aa2210 359f6723fc
commit 5c38e76c11
10 changed files with 18 additions and 6 deletions
--- a/test/src/unit-cbor.cpp
+++ b/test/src/unit-cbor.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 */

 #include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")

 #include <nlohmann/json.hpp>
 using nlohmann::json;
--- a/test/src/unit-constructor1.cpp
+++ b/test/src/unit-constructor1.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 */

 #include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")

 #define JSON_TESTS_PRIVATE
 #include <nlohmann/json.hpp>
--- a/test/src/unit-readme.cpp
+++ b/test/src/unit-readme.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 */

 #include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")

 #include <nlohmann/json.hpp>
 using nlohmann::json;
--- a/test/src/unit-reference_access.cpp
+++ b/test/src/unit-reference_access.cpp
@@ -28,7 +28,6 @@ SOFTWARE.
 */

 #include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")

 #include <nlohmann/json.hpp>
 using nlohmann::json;
--- a/test/src/unit-regression1.cpp
+++ b/test/src/unit-regression1.cpp
@@ -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>
--- a/test/src/unit-regression2.cpp
+++ b/test/src/unit-regression2.cpp
@@ -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>