+3252
−6608
File changed.
Preview size limit exceeded, changes collapsed.
Loading
Admins will be upgrading ORNL GitLab Servers on Saturday, 16 May 2026, from 7 AM until 11 AM EST. Repositories will experience intermittent outages during this time.
Code extracted from:
https://github.com/nlohmann/json.git
at commit 4f8fba14066156b73f1189a2b8bd568bde5284c5 (master).
Upstream Shortlog
-----------------
Alex Beregszaszi (1):
83491801 Fix spelling (#3125)
Alexander Karzhenkov (9):
42a9dc0b Improve json_ref implementation
8247a217 Disrupt all C++17 tests to check if they are executed
aae0e495 Fix travis configuration to enable C++17 tests
39b8d6bd Restore intentionally disrupted C++17 tests
cd7acc1d Include <string_view> in "nlohmann/json.hpp" when C++17 is used
9493f4be Advance gcc library version for clang++-7
7092890f Properly select the build type for Travis
10db9184 Configure Travis to build "Release" instead of "Debug"
903b8a6e Build as "Debug" for coverage test
Amir Masoud Abdol (3):
8e4996c1 Updating the Homebrew Command
b65748f7 Using the homebrew/core Formula
14af5d4a fixing the doc files
Anthony VH (18):
1e825e4f Add support for deserialization of STL containers of non-default constructable types (fixes #2574).
c0a8b45b Renamed template parameter and added some comments.
1b113f73 Added extra tests to improve coverage.
23f462b5 Reduced code duplication, renamed tag to identity_tag.
672e8bfc Fixed std::pair trying to deserialize via array functions.
6ebf274c Add internal version of is_default_constructible to work around LWG 2367.
6278f31d Simplify from_json overloads.
6ef1614f Refactor json::get() to use priority_tag.
fc8c5842 Regenerated single include.
fbf6df63 Enable member function calls in trailing return decltype expressions for older compilers.
d7c0f157 Merged from_json for pair and tuple to try to fix C2995 error in old MSVC versions.
6eb37e9b Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers.
848927ae Updated comments as requested.
130382f2 Remove comment about GCC commit which didn't really relate to the code.
322bc99d Reran amalgamate.
8e79917d Fix clang-tidy complaints.
2b865131 Fixing CI errors.
58b83b71 Set parent pointers for values inserted via update() (fixes #3007). (#3008)
Arseniy Terekhin (1):
355fa6c3 🚨 gdb_pretty_printer failure on basic types
Benjamin A. Beasley (1):
ef826b6f Update doctest from 2.4.4 to 2.4.6 (fixes #2686)
Carl Smedstad (1):
62f2997b Fix assertion failure for JSON_DIAGNOSTICS (#3037)
Cristi Vîjdea (1):
f5b3fb32 Fix typos in operator[] documentation (#3102)
Daniel Albuschat (1):
ee1208aa Docs: Update `skip_comments` to `ignore_comments` (#3145)
David Pfahler (9):
1a1381f0 Fixes #2728
31c4c8f3 Fixes #2730
38952643 generate amalgation to fix CI for #2730
6b267e3c fixed amalgation file for #2730
0a2de2f5 fixed amalgation file for #2728
5a77314c replaced define
d140a1c7 fixed amalgamation file
ae9bbbc9 include io only if JSON_NO_IO is not set for #2728
e939b596 fixed amalgation file for #2728
Dirk Stolle (1):
fe230334 fix typos in documentation (#3140)
Doron Behar (1):
53a9850e pkg-config.pc.in: Don't concatenate paths
Ferry Huberts (6):
44d60f8d All: fix warnings when compiling with -Wswitch-enum
832cee5b Adjust warnings flags, as requested
e7a69b8d Adjust more files after actually building like the CI
95b73bcd Forgot to amalgate
364a21be Add coverage exclusion comments, as requested
cdbc50b9 Again forgot to amalgate (sigh)
Fraser (1):
90d51b92 Update parse_exceptions.md
Giovanni Cerretani (1):
28a16972 Fix -Wunused warnings on JSON_DIAGNOSTICS (#2976)
Jaakko Moisio (1):
467f622c Fix compilation of input_adapter(container) in edge cases
Jason Dsouza (2):
6d7959e0 Keep consistent formatting
f118091e Update CMakeLists.txt
Jean-Philippe Lemieux (1):
afbb84b2 Add a cmake option to use SYSTEM in target_include_directories
Joseph Blackman (1):
9f45d314 Apply suggestions from code review
Jun Jie (1):
41a99567 fix cmake script overwriting compiler path
Krylov Yaroslav (4):
5155cc2c Ranged insert test section is added in unit-ordered_json.cpp
972c15f2 ordered_map::insert(InputIt first, InputIt last) is added
6390fca7 Doctest is updated to v2.4.1
a1772743 Doctest is updated to v2.4.3
Louis Dionne (1):
b0e5965d Properly constrain the basic_json conversion operator
Maarten Becker (1):
825d3230 Fix: Warning for shadowed variables (#3188) (#3193)
Martin Stump (4):
5c589dd1 Add MAIN_PROJECT check for test and install options
79050888 Set MAIN_PROJECT=OFF initially
ea759d03 Compare to CMAKE_CURRENT_SOURCE_DIR for main project check
1771e924 Remove comment on CTest inclusion
Morten Fyhn Amundsen (1):
193bf9d6 Fix typo in README
Niels Lohmann (259):
824d55bf 📝 fix documentation #1668
4080d0b1 ✅ add test to compile without exceptions
dd8cb2ac 🚨 remove -Wimplicit-fallthrough warning #2348
411fc324 ⬆️ Hedley 14 (dev branch)
9d726c25 ♻️ remove "#define private public"
fe89049a 📝 add more API documentation
874f49e9 📝 add more API documentation
178125ff 📝 add docset
d360fec2 📝 add offline pages for docset
ce6adc44 📝 add more API documentation
dd2fb3b4 📝 add more API documentation
29842026 🚚 remove quotes from filename to fix Windows build
6674561d 📝 add more API documentation
0356e0c7 📝 add more API documentation
f6c2947f 📝 add more API documentation
fb8adb8e 👷 ignore gh-pages branch in CircleCI
0c208882 👷 ignore gh-pages branch in CircleCI
1ce0ed5a 👷 ignore gh-pages branch in CircleCI
d8ed98a7 📝 add more API documentation
fb5c2013 📝 add more API documentation
a430d25f 📝 add more API documentation
5c4cc20e 📝 add more API documentation
6b04f05e 📝 add more API documentation
fe507a7e 🚚 remove < from filename to fix Windows build
3be6ee35 🚚 remove < from filename to fix Windows build
b386f4de 📝 fix and extend documentation of discarded values
9d81eedb 📝 fix and extend documentation of discarded values
d9843fc9 📝 add note for Intel compilers #2346
1047d09b ✅ annotate non-reproducible tests #2324
1bcabd9e 📝 fix URLs to documentation
fd7a9f60 💰 add sponsor
eaac9180 👷 remove clang9 CI
3322c9df 🔒 use HTTPS
d8d8cbf6 🔨 fix site URL
fc4040ce 🔨 clean up CI
d028eff9 📦 add license to include.zip #2487
85ffc85a 🎨 amalgamate code
467986fe ♻️ do not unconditionally redefine C++14 constructs
94d177e0 📄 clarify license
5cc5285f 🚨 fix shadowing warning
c026e1a4 🚨 fix warnings
f15d4475 🚨 fix warnings
dfedefb9 🚨 fix warnings
5dd06714 🐛 allow parsing from std::byte containers #2546
7b98df51 ✅ add regression test
433da313 ⚗️ try to use GCC 10
ca51dc62 ⚗️ try to use Clang 10
91d7aa57 ⚗️ add C++20 build
77be4f6a ⚗️ add C++20 build
e4fc5984 ⚗️ add C++20 build
4402176d ✅ add regression test
c8866467 🚨 fix warning
bdb2469c 🚨 fix warnings
fc7e181c ⚗️ fix string representation
00e3f69a ⬆️ update Doxyfile for doxygen 1.9.0
1587acdb 📝 adjust wording
a4d491e2 🚧 better diagnostics
7b047861 🚧 add diagnostics to exceptions
ecaab32e 🚧 add switch for diagnostics
c6e7fa21 🚧 fix preprocessor check
09cd4ed1 🚧 fix preprocessor check
7323a8eb 🚧 add tests
ec0b1798 🚧 implement more parent relations
294fa343 🐛 fix bug in move constructor
085d497b 📄 update copyright year
01f6b2e7 📄 update copyright year
ddc3bb19 👌 remove unnecessary assignment from destructor
0617bd24 👌 fix operator[]
04a0a071 👌 fix move constructor and move assignment
e4af1ddb 👌 fix operator[]
d4a91b74 👌 clean operator[]
43cd5c8a 👌 fix constructor
e1607490 ♻️ move diagnostic code in header
a8340452 🚨 fix warnings
1d6ba22f ♻️ simplify code
9d0150c2 ♻️ simplify code
ff57bdcc 🐛 fix invariants
14be8c69 💰 add sponsor
b9d3aa40 ♻️ split set_parent function
a7762168 📝 fix comment
0d1fb383 👌 address comment
f8037660 ♻️ add iterator set_parent function
b0d8628c 👌 address comments
7633a21e 💚 fix build
29f7abf5 🚨 fix format-truncation warning #2572
e9d64113 🐛 proper JSON Pointer escape in diagnostic messages
aeecc09b ✅ add tests for diagnostics
e23af743 🚨 fix warnings
65107f7c 💚 fix build
5ec09805 💚 fix build
33379684 ✅ improve coverage
d6ff059a 👌 addressed review comments
51ac6000 ✅ improve coverage
d00ad33e 📝 update documentation
42218cac ⚗️ try 9 bytes
7b7da08f 📝 update documentation
312a9988 🚸 add GDB pretty printer
380a613f 🐛 fix bug in diagnostics_t
c190a72f 👌 apply suggestion
e8dba10f ✅ add test
74cc0ab4 ♻️ remove diagnostics_t class
524eea58 👌 remove unused template parameter
3b63a472 🚨 suppress warning
ffdeb774 🚨 fix warnings #2615
5b0c8046 🐛 properly assign two labels to one test case #2596
9f6b78ee 📝 add documentation
6d4eed5a 🚨 fix warning
56a6dec0 🔀 merge develop branch
bb90e34d ⬆️ Hedley v15
6f551930 🚨 add new CI and fix warnings (#2561)
ca9a1f2f 📝 add note to outdated exceptions
41dbd503 📄 use code from Google Abseil
9d573511 🐛 set correct value for JSON_ImplicitConversions in ci_test_noimplicitconversions
c591b6ca 👷 move some MSVC jobs from AppVeyor to GitHub Actions
1f1fa9f3 🔥 remove some Travis builds
f2680359 👷 consolidate CI
ae99a31b 🚧 add more CI tests
077fe41a 🚧 do not check pushes to non-default branches
d927f445 💚 fix build
10fc5162 ⬆️ use Clang 12 where available
0638a27e 👷 add step for Infer
608fbffc 📝 update compiler versions
52717b74 👷 add clang 11
f6e9654a 🔇 suppress unsigned integer warnings
cdfe8654 📝 add documentation for numbers
d0ab2b86 📝 update documentation
b08139ea ♻️ replace EOF with std::char_traits<char>::eof()
1d8869f8 👷 add Drone CI
77a5cd24 🔧 build cmake
a6e2fd1b 🔧 use built CMake
27a71ccd 🔧 fix path
9ec8f4ef 🔧 fix ctest path
f3193e1e 🔧 build ctest
42f25122 🔧 skip slow tests
e6e73095 👷 arm and arm64
df6fa6c1 👷 arm and arm64
9746f72d 🔨 do not check certificate
3685dbdc 🔧 checkout cmake via git
c73bd8b2 🔧 ignore certificate
0c62748b 🔧 change repository
014724f3 ⚗️ change path
a44b29ec 🔧 fix paths
e856b507 🔥 remove arm build
7cafc5c6 📝 document Drone CI
311730bc 👷 add C++ standards to macOS matrix #2491
9f5ee3f1 👷 fix syntax
2b685c74 👷 reduce load
30e52eb0 👷 execute all tests
032f32eb 👷 add Clang 12
802895b4 👷 remove Clang 10
71fd9bd9 📝 fix documentation (#2845)
5c8d0af5 📝 add comment for handling of negative zeros #2854
a82f66be 📝 document JSON_NO_IO macro #2842
7442c246 🚨 suppress missingReturn warnings
24968803 ⚗️ fix coverage
d40e98ec 🐛 fix assertion failure #2838
b0730f29 🐛 fix logics
bc7e8faa 🔥 remove duplicated line
3bb94670 ♻️ move capacity check to set_parent function
a711e1f5 🚨 fix warnings
db980739 ✅ add regression test
149ded85 ♻️ simplify destroy() function for primitive types
6cbdc839 🐛 fix leak for strings
c1298e69 🐛 fix leak for strings
0f8666ec 🐛 fix leak for strings
0011cd1b 🐛 fix leak for strings
f6863e06 🐛 fix leak for all types
ecaac226 💡 add comment to describe j.m_value.destroy(j.m_type) calls
3e4723a4 🔨 remove noexcept annotation
953dcfb6 🚨 fix warning #2572
b7cc4708 ⚡ avoid string in case of empty objects
c65369ac 👷 fix Codacity badge
835749ef ✅ add test for JSON_SystemInclude flag
fb1ee4f9 📝 update documentation
3db8903f 📝 restructure README
a0863b8c 📝 add support section
926fab47 📝 fix GIF examples #2457
7066ab12 🎨 reindent code
45016c44 ⬆️ update Doxyfile
03270ef0 👥 update contributors
eba82ecd Refactor Unicode tests (#2889)
19a5e121 CMake cleanup (#2885)
1c030ccc ✅ add regression test #2824
2c030bac ✅ add regression test #2824
7feb2c20 🚨 fix useless-cast warnings
c7822840 ✅ add regression test #2824
9a459e1b 🚨 fix useless-cast warnings
f4716a0d 🚨 fix useless-cast warnings
8676f674 ✅ add regression test #2824
a5440329 📄 add CITATION file
5a1bc76f ⚗️ switch off exceptions
c3df4ffd 🚨 fix warning
eb488bb4 📝 add note for wstring handling
7c19aa22 ♻️ overwork byte_container_with_subtype
3eb1fb6b ♻️ change type of binary subtype
046df035 ♻️ change type of binary subtype
b7db1d68 ♻️ fix CBOR and BSON
51a98800 ✅ add tests for CBOR
89c98dfc ✨ add option to process binary subtypes in CBOR
b74474e3 💚 fix MSVC build
176e9bf0 ✅ add tests for CBOR
c5928501 💚 fix MSVC build
346c9c1a 💚 fix MSVC build
a4c3cf77 💚 fix MSVC build
db7ccafb 💚 fix MSVC build
523f7c2c 💡 update documentation
83c005f8 ⚗️ try minimal example
36394cc2 ⚗️ try minimal example
0d530c9d ⚗️ try minimal example
edc203a8 ⚗️ try minimal example
26569f8e ⚗️ try minimal example
b792bf56 ⚗️ try minimal example
68d8661f 📝 update documentation
e20f3f95 🚨 guard GCC pragmas #2924
e65db834 ⚗️ add -WX flag to MSVC builds
789280fc 🚨 fix C4309 warning
fecb0185 ⚗️ add -WX flag to MSVC builds
288cdf9a ⚗️ add -WX flag to MSVC builds
4b0e04eb 🚨 fix C4100 warnings
1aceeff3 🚨 fix C4244 warning
09237272 👥 update documentation
fa5d3b5a 👷 run CI for release branches
f1e63a83 👷 run CI for release branches
8cae9d7c Overwork warning flags (#2936)
1de378f5 🔖 set version to 3.10.0
5d3ad31d 🔥 remove outdated json_unit binary
54d9cd5a 🔧 guard tests with JSON_Install flag
cfb71ad1 🐛 adding missing header
f79bed6d 👷 avoid duplicate AppVeyor builds
23e3b622 📝 add documentation for integration via vcpkg
55281e03 📝 add documentation for integration via vcpkg
e8e93ee4 👷 update Travis badge
97c7a35a ✅ add regression test
f03127eb Set stack size for some unit tests when using MSVC (#2961)
c753165d Fix parent update for diagnostics with ordered_json (#2963)
34e2c4ab 📝 add link to Homebrew package (#2966)
8ad66e91 🔖 set version to 3.10.1
33b674b4 🔖 set version to 3.10.2
e0b02c35 Use new Docker image (#2981)
fd0aa4fb 👷 re-add Clang 12 (#2986)
bbdb29c6 Update docset generation script (#2967)
0b345b20 Allow allocators for output_vector_adapter (#2989)
ea528bbf 📝 fixed Clang version (#3040)
ab6a2c74 🔖 set version to 3.10.3
ba046e4e Allow to use get with explicit constructor (#3079)
80cf9d70 Revert invalid fix (#3082)
a09bfa5f 🔖 set version to 3.10.4
c4a4e672 📝 add examples for parsing from iterator pair (#3100)
7440786b Update CI (#3088)
5d87c4d4 Add recursive update function (#3069)
5c08a52f ♻️ overwork std specializations (#3121)
e9f88c2f Add missing erase(first, last) function to ordered_map (#3109)
6d311592 Add C++17 copies of the test binaries (#3101)
29cd970b Consolidate documentation (#3071)
e6bf789f ⬆️ update cpplint (#3225)
1aca6cb9 Add build step for NVCC and fix a warning (#3227)
926df56d 🔥 remove Travis CI #3087 (#3233)
b69713c3 Fix compilation error with NVCC (#3234)
b5364faf 🔖 set version to 3.10.5
Pierre Hallot (1):
43360484 Fix extra ";" clang warnings
Prince Mendiratta (1):
76030463 Fix FAQ hyperlink typo in readme (#3148)
Rafail Giavrimis (1):
b7e493e9 Specified git branch for google benchmark fetch
Remy Jette (1):
0a9ec38f Remove HEDLEY annotation from exception::what()
Ronak Buch (1):
67d822d9 Fix typos in documentation
Sergey Linev (2):
71cb7d12 Change argument name "subtype" in byte_container_with_subtype
30dd0c0f Change underscore placement
Sven Fink (3):
095aae19 Supress -Wfloat-equal on intended float comparisions
353d5971 Add more suppressions on float comparisons
3f5545f9 Remove -Wfloat-equal suppressions on tests
Théo DELRIEU (2):
80df5e8d meta: fix is_compatible/constructible traits (#3020)
0e694b40 fix std::filesystem::path regression (#3073)
TotalCaesar659 (1):
9a599ae6 Update URLs to HTTPS
William A. Wieselquist (1):
567e2e34 Fix missing 1.78 in example in README.md
abbaswasim (1):
ddbdb658 Fix amount of entries in the json object
bl-ue (1):
c9d325b6 readme: fix tilde character display
jbzdarkid (1):
64ff1cf9 Add asserts to suppress C28020
justanotheranonymoususer (3):
9710108d Consistency with `using` in README.md
c3d7fcb7 Update README.md
e970f310 Update arbitrary_types.md
leozz37 (1):
b273f28d 📝 add CPM.Cmake example
mb0202 (1):
7194245a Fixed typo in parse.md (#2968)
offa (1):
7935a683 link to conan package in readme
raduteo (2):
e8dbd7be Update json.hpp
35d79203 Update json.hpp
File changed.
Preview size limit exceeded, changes collapsed.