Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Hu Wei
Json
Commits
f1768a54
Unverified
Commit
f1768a54
authored
6 years ago
by
Niels Lohmann
Browse files
Options
Download
Plain Diff
Merge branch 'release/3.3.0' into develop
parents
cd518fbb
cdfe6ced
develop
clang-format
coverity_scan
feature/optional
issue2228
issue2315
issue2324
issue2342
master
release/3.9.1
3.6.1
v3.9.1
v3.9.0
v3.8.0
v3.7.3
v3.7.2
v3.7.1
v3.7.0
v3.6.1
v3.6.0
v3.5.0
v3.4.0
v3.3.0
No related merge requests found
Changes
56
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
CMakeLists.txt
+1
-1
CMakeLists.txt
ChangeLog.md
+69
-2
ChangeLog.md
doc/Doxyfile
+1
-1
doc/Doxyfile
doc/examples/README.link
+1
-1
doc/examples/README.link
doc/examples/meta.output
+2
-2
doc/examples/meta.output
doc/index.md
+1
-1
doc/index.md
doc/json.gif
+0
-0
doc/json.gif
include/nlohmann/json.hpp
+3
-3
include/nlohmann/json.hpp
meson.build
+1
-1
meson.build
single_include/nlohmann/json.hpp
+3
-3
single_include/nlohmann/json.hpp
test/src/fuzzer-driver_afl.cpp
+1
-1
test/src/fuzzer-driver_afl.cpp
test/src/fuzzer-parse_cbor.cpp
+1
-1
test/src/fuzzer-parse_cbor.cpp
test/src/fuzzer-parse_json.cpp
+1
-1
test/src/fuzzer-parse_json.cpp
test/src/fuzzer-parse_msgpack.cpp
+1
-1
test/src/fuzzer-parse_msgpack.cpp
test/src/fuzzer-parse_ubjson.cpp
+1
-1
test/src/fuzzer-parse_ubjson.cpp
test/src/unit-algorithms.cpp
+1
-1
test/src/unit-algorithms.cpp
test/src/unit-allocator.cpp
+1
-1
test/src/unit-allocator.cpp
test/src/unit-alt-string.cpp
+1
-1
test/src/unit-alt-string.cpp
test/src/unit-capacity.cpp
+1
-1
test/src/unit-capacity.cpp
test/src/unit-cbor.cpp
+1
-1
test/src/unit-cbor.cpp
with
92 additions
and
25 deletions
+92
-25
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets