Commit Graph

4311 Commits

Author SHA1 Message Date
Niels Lohmann 7c26010380 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-11-01 13:31:49 +01:00
Niels Lohmann 7440786b81 Update CI (#3088)
* 👷 prepare GitHub actions for new Docker image

* 👷 use experimental docker image

* 👷 use Clang-Analyzer 14

* 🔇 suppress readability-identifier-length

* 🔇 suppress more Clang-Tidy warnings

* ♻️ simplify code

* 🔇 suppress more Clang-Tidy warnings

* 🔇 suppress more Clang-Tidy warnings

* 🚨 fix warning

* 🚨 fix warning

* 🚨 fix warning

* 👷 use new Docker image
2021-10-29 21:27:34 +02:00
Niels Lohmann c4a4e672fd 📝 add examples for parsing from iterator pair (#3100) 2021-10-29 21:26:41 +02:00
Cristi Vîjdea f5b3fb326c Fix typos in operator[] documentation (#3102)
* Fix typos in operator[] documentation
* Fix additional typo
2021-10-20 21:59:33 +02:00
Niels Lohmann d997d1b275 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-10-17 15:27:48 +02:00
Niels Lohmann 67c8ead923 Merge branch 'release/3.10.4' into develop 2021-10-16 14:47:23 +02:00
Niels Lohmann a09bfa5faa 🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann 80cf9d7065 Revert invalid fix (#3082)
*  revert invalid fix
2021-10-16 13:27:28 +02:00
Niels Lohmann ba046e4ea4 Allow to use get with explicit constructor (#3079)
*  remove "fix" that caused #3077
2021-10-14 21:01:14 +02:00
Théo DELRIEU 0e694b4060 fix std::filesystem::path regression (#3073)
* meta: rework is_compatible/is_constructible_string_type

These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in #3020 broke them.

* support std::filesystem::path

Fixes #3070
2021-10-14 19:19:46 +02:00
Niels Lohmann 4b1cb9eee1 Merge branch 'release/3.10.3' into develop 2021-10-08 14:39:34 +02:00
Niels Lohmann ab6a2c7425 🔖 set version to 3.10.3 2021-10-08 13:58:48 +02:00
Théo DELRIEU 80df5e8de6 meta: fix is_compatible/constructible traits (#3020)
The previous version relied on the existence of an 'iterator' type.

As mentioned in comments, this is not the proper way to do it and
causes issues with certain types (e.g. views from range-v3).

Add a 'is_range' trait that properly detects the return type of
'begin'/'end', and use it in instead.
2021-10-07 12:32:25 +02:00
Carl Smedstad 62f2997b79 Fix assertion failure for JSON_DIAGNOSTICS (#3037)
* Fix assertion failure #3032
2021-10-07 12:24:09 +02:00
Niels Lohmann ea528bbfda 📝 fixed Clang version (#3040) 2021-09-28 12:36:42 +02:00
Niels Lohmann cec6b21695 🚨 fix warning 2021-09-12 22:48:34 +02:00
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"
v3.10.1
2021-08-24 08:08:02 +02:00