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

Fix CI failures of the unity test build

Browse Source 
- keep JSON_DISABLE_ENUM_SERIALIZATION and
  JSON_DISABLE_TUPLE_REFERENCE_CONVERSION defined with
  JSON_TEST_KEEP_MACROS, so that every file of a batch sees them, not only
  the first one
- mark JSON_TESTS_PRIVATE in the generated batch file as used, as GCC and
  Clang report an unused definition when the first file defines it again
  (-Wunused-macros)
- suppress bugprone-suspicious-include for the #include-d .cpp files
- avoid local json aliases and variables that hide a global json of
  another file in the same batch (MSVC C4459)

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-09 23:23:04 +02:00
1 parent 993e37e7ec
commit 769c5cde57
5 files changed
+79 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/src/unit-element_access2-cpp17.cpp
+9 -15
View File
@@ -876,8 +876,6 @@ TEST_CASE_TEMPLATE("element access 2 (additional value() tests) (C++17)", Json,
TEST_CASE("operator[] with user-defined std::string_view-convertible types")
{
using json = nlohmann::json;
class TestClass
{
std::string key_data_ = "foo";
@@ -897,7 +895,7 @@ TEST_CASE("operator[] with user-defined std::string_view-convertible types")
}
};
json j = {{"foo", "from_class"}, {"bar", "from_struct"}};
nlohmann::json j = {{"foo", "from_class"}, {"bar", "from_struct"}};
const TestClass foo_obj;
const TestStruct bar_obj;
@@ -959,12 +957,10 @@ TEST_CASE("keys convertible to std::string_view work with all lookup functions (
SECTION("nlohmann::json")
{
using json = nlohmann::json;
SECTION("ViewKey")
{
json j = {{"a", 1}};
const json& cj = j;
nlohmann::json j = {{"a", 1}};
const nlohmann::json& cj = j;
CHECK(j[ViewKey{}] == 1);
CHECK(cj[ViewKey{}] == 1);
@@ -981,8 +977,8 @@ TEST_CASE("keys convertible to std::string_view work with all lookup functions (
SECTION("DualKey")
{
json j = {{"a", 1}};
const json& cj = j;
nlohmann::json j = {{"a", 1}};
const nlohmann::json& cj = j;
CHECK(j[DualKey{}] == 1);
CHECK(cj[DualKey{}] == 1);
@@ -1000,12 +996,10 @@ TEST_CASE("keys convertible to std::string_view work with all lookup functions (
SECTION("nlohmann::ordered_json")
{
using ordered_json = nlohmann::ordered_json;
SECTION("ViewKey")
{
ordered_json j = {{"a", 1}};
const ordered_json& cj = j;
nlohmann::ordered_json j = {{"a", 1}};
const nlohmann::ordered_json& cj = j;
CHECK(j[ViewKey{}] == 1);
CHECK(cj[ViewKey{}] == 1);
@@ -1022,8 +1016,8 @@ TEST_CASE("keys convertible to std::string_view work with all lookup functions (
SECTION("DualKey")
{
ordered_json j = {{"a", 1}};
const ordered_json& cj = j;
nlohmann::ordered_json j = {{"a", 1}};
const nlohmann::ordered_json& cj = j;
CHECK(j[DualKey{}] == 1);
CHECK(cj[DualKey{}] == 1);