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

Merge branch 'develop' into copy-scratch-allocator

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-25 08:24:19 +02:00
parent abf827a5bd f290b36ad2
commit f386f367df
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows.yml
+2 -2
View File
@@ -124,11 +124,11 @@ jobs:
steps: steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Run CMake (Release) - name: Run CMake (Release)
run: cmake -S . -B build -G "Visual Studio 17 2022" -A ARM64 -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/W4 /WX" run: cmake -S . -B build -G "Visual Studio 18 2026" -A ARM64 -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/W4 /WX"
if: matrix.build_type == 'Release' if: matrix.build_type == 'Release'
shell: pwsh shell: pwsh
- name: Run CMake (Debug) - name: Run CMake (Debug)
run: cmake -S . -B build -G "Visual Studio 17 2022" -A ARM64 -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_FLAGS="/W4 /WX" run: cmake -S . -B build -G "Visual Studio 18 2026" -A ARM64 -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_FLAGS="/W4 /WX"
if: matrix.build_type == 'Debug' if: matrix.build_type == 'Debug'
shell: pwsh shell: pwsh
- name: Build - name: Build
tests/src/unit-merge_patch.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ std::string nested_objects(const std::size_t depth, const int variant)
} }
text += "\"a\":"; text += "\"a\":";
} }
text += variant == 1 ? "{\"x\":1,\"y\":null}" : "{\"y\":2}"; text += variant == 1 ? R"({"x":1,"y":null})" : "{\"y\":2}";
text.append(depth, '}'); text.append(depth, '}');
return text; return text;
} }
tests/src/unit-modifiers.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ std::string nested_objects(const std::size_t depth, const int variant)
if (variant == 2 && i % 5 == 0) if (variant == 2 && i % 5 == 0)
{ {
// an object replacing a primitive, which is not merged // an object replacing a primitive, which is not merged
text += "\"s0\":{\"o\":1},"; text += R"("s0":{"o":1},)";
} }
text += "\"a\":"; text += "\"a\":";
} }