Commit Graph

4295 Commits

Author SHA1 Message Date
Niels Lohmann
cf81564797
improve coverage 2021-09-12 22:21:08 +02:00
Niels Lohmann
e6013608cc
improve coverage 2021-09-12 19:04:24 +02:00
Niels Lohmann
96b9877d20
Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-09-12 18:57:18 +02:00
Niels Lohmann
0b345b20c8
Allow allocators for output_vector_adapter (#2989)
* ♻️ allow allocators for vectors

*  add regression tests
2021-09-12 18:55:47 +02:00
Anthony VH
58b83b71dc
Set parent pointers for values inserted via update() (fixes #3007). (#3008)
* Set parent pointers for values inserted via update() (fixes #3007).

* Moved test for #3007 to proper file.

* Enable access to private members in diagnostics unit tests.

* Make style consistent with rest of code.

* Forced amalgamate rerun.

* Refactor test for #3007 so it doesn't use private members. Also extend to test both update() functions.

* Added fix for #3007 to update(const_iterator, const_iterator) as well.

* Added failing example code from #3007 as extra test.
2021-09-12 18:51:25 +02:00
Niels Lohmann
95d75c2346
🚨 fix warnings 2021-09-12 13:33:45 +02:00
Niels Lohmann
b932217c15
🚧 add object and string parser for BON8 2021-09-11 23:28:16 +02:00
Niels Lohmann
e27c127068
🚧 start BON8 parser 2021-09-11 22:46:49 +02:00
Niels Lohmann
627eefa5ad
🏁 set flag for MSVC for test-binary_formats 2021-09-11 16:01:10 +02:00
Niels Lohmann
e9b1ab4e0a
📝 update table for binary formats 2021-09-11 15:40:47 +02:00
Niels Lohmann
7c55a91004
📝 add documentation 2021-09-11 14:59:21 +02:00
Niels Lohmann
5221115ff1
♻️ implement floating-point special values 2021-09-11 14:27:38 +02:00
Niels Lohmann
6bfd21e321
♻️ adjust negative integer representation 2021-09-11 13:50:54 +02:00
Niels Lohmann
d798ca24aa
♻️ adjust positive integer representation 2021-09-11 13:22:23 +02:00
Niels Lohmann
623f0e96e2
improve coverage 2021-09-05 12:44:39 +02:00
Niels Lohmann
62487fcf68
improve coverage 2021-09-05 11:26:12 +02:00
Niels Lohmann
f444d9c14f
improve coverage 2021-09-05 09:25:58 +02:00
Niels Lohmann
b4f2cf769a
🚨 fix warnings 2021-09-04 23:26:37 +02:00
Niels Lohmann
78e59f502b
🚨 fix warnings 2021-09-04 22:59:43 +02:00
Niels Lohmann
f16465c614
🚨 fix warnings 2021-09-04 22:48:08 +02:00
Niels Lohmann
526bee2bfb
🚨 fix warnings 2021-09-04 22:36:43 +02:00
Niels Lohmann
6cf42d1b55
🚨 fix warnings 2021-09-04 15:54:17 +02:00
Niels Lohmann
e6518ff2d6
🚧 add integer support 2021-09-04 14:54:54 +02:00
Niels Lohmann
c7440a6da2
Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-09-01 20:49:24 +02:00
Niels Lohmann
bbdb29c658
Update docset generation script (#2967)
* 📝 update docset generation script

* 📝 update documentation
2021-09-01 08:43:10 +02:00
Niels Lohmann
f656f535e1
🚧 begin BON8 implementation 2021-08-31 15:04:06 +02:00
Niels Lohmann
fd0aa4fb0d
👷 re-add Clang 12 (#2986) 2021-08-30 10:54:14 +02:00
Niels Lohmann
e0b02c355e
Use new Docker image (#2981) 2021-08-29 18:05:31 +02:00
Niels Lohmann
9dfd91695c
Merge branch 'release/3.10.2' into develop 2021-08-26 09:08:33 +02:00
Niels Lohmann
33b674b4b2
🔖 set version to 3.10.2 2021-08-26 08:13:04 +02:00
Giovanni Cerretani
28a169725e
Fix -Wunused warnings on JSON_DIAGNOSTICS (#2976)
* Fix #2975

Define JSON_DIAGNOSTICS to 0 if not defined to fix annoying Wundef warnings.

* amalgamated
2021-08-26 07:35:01 +02:00
Niels Lohmann
1fd2213fd2
Merge branch 'release/3.10.1' into develop 2021-08-24 21:08:43 +02:00
Niels Lohmann
8ad66e9136
🔖 set version to 3.10.1 2021-08-24 20:19:55 +02:00
mb0202
7194245a31
Fixed typo in parse.md (#2968)
Changed a potential typo: "charater" -> "character"
2021-08-24 08:08:02 +02:00
Niels Lohmann
34e2c4ab88
📝 add link to Homebrew package (#2966) 2021-08-22 21:58:37 +02:00
Niels Lohmann
c753165db6
Fix parent update for diagnostics with ordered_json (#2963)
🐛 fix parent update for diagnostics with ordered_json
2021-08-22 20:30:20 +02:00
Niels Lohmann
f03127eb69
Set stack size for some unit tests when using MSVC (#2961)
* 🏁 set stack size for some unit tests
2021-08-21 13:55:06 +02:00
Niels Lohmann
cb053bceb1
Merge pull request #2960 from nlohmann/issue2958
Add regression test
2021-08-20 16:34:38 +02:00
Niels Lohmann
97c7a35a2b
add regression test 2021-08-20 14:49:58 +02:00
Niels Lohmann
eb6541a30c
Merge pull request #2959 from nlohmann/issue2938
Update Travis badge
2021-08-20 13:56:16 +02:00
Niels Lohmann
e8e93ee43b
👷 update Travis badge 2021-08-20 13:53:31 +02:00
Niels Lohmann
611fd22557
Merge pull request #2957 from Hallot/bug/fix-some-clang-warnings
Fix some extra ";" clang warnings
2021-08-20 13:32:38 +02:00
Pierre Hallot
433604843d
Fix extra ";" clang warnings 2021-08-19 17:04:34 +02:00
Niels Lohmann
44ffaa052c
Merge pull request #2943 from amirmasoudabdol/patch-1
Updating the Homebrew Command
2021-08-19 12:03:52 +02:00
Amir Masoud Abdol
14af5d4a9f fixing the doc files 2021-08-19 09:31:39 +02:00
Niels Lohmann
273d911252
Merge pull request #2954 from nlohmann/issue2944 2021-08-19 06:37:42 +02:00
Niels Lohmann
55281e03af
📝 add documentation for integration via vcpkg 2021-08-18 21:25:23 +02:00
Niels Lohmann
23e3b622aa
📝 add documentation for integration via vcpkg 2021-08-18 20:49:13 +02:00
Niels Lohmann
abd829e6c6
Merge pull request #2950 from senyai/patch-2
🚨 fix gdb_pretty_printer failure on basic types
2021-08-18 20:07:28 +02:00
Niels Lohmann
5cf5ccd108
Merge pull request #2948 from nlohmann/missing_header
Add header to use value_t
2021-08-18 20:07:05 +02:00