luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,326 Commits 13 Branches 56 Tags 237 MiB
9105f5514e
Commit Graph

1484 Commits

Author SHA1 Message Date
Niels Lohmann
9dfe422e65
Merge branch 'develop' of https://github.com/nlohmann/json into bon8 
 Conflicts:
	doc/mkdocs/docs/api/basic_json/index.md
	doc/mkdocs/docs/features/binary_formats/bson.md
	doc/mkdocs/docs/features/binary_formats/index.md
	doc/mkdocs/mkdocs.yml
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-12-31 14:53:13 +01:00
Niels Lohmann
1aca6cb949
Add build step for NVCC and fix a warning (#3227) 
* 👷 add step for NVCC build #2676
* 🚨 fix warning (code taken from #2736)
* 👷 use version 2.2.0 of the CI image
 2021-12-30 13:40:15 +01:00
Niels Lohmann
6d3115924c
Add C++17 copies of the test binaries (#3101) 
* ⚗️ add C++17 copies of the test binaries
* ⚗️ use proper header for filesystem
* 🚨 fix warnings
* ⚗️ do not use too old compilers with C++17
* ✅ add test
* 🔨 add more constraints #3097
* ⚗️ use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
* ⚗️ use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
* 👷 use published CI image
 2021-12-29 09:47:05 +01:00
Dirk Stolle
fe230334d9
fix typos in documentation (#3140) 
* fix typos in documentation

* revert changes to ChangeLog.md
 2021-11-14 14:25:14 +01:00
Niels Lohmann
e9f88c2fad
Add missing erase(first, last) function to ordered_map (#3109) 2021-11-09 22:24:58 +01:00
Niels Lohmann
5c08a52fd6
♻️ overwork std specializations (#3121) 2021-11-04 16:38:40 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function (#3069) 
* ✨ add recursive update function
 2021-11-03 13:52:20 +01:00
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
d997d1b275
Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-10-17 15:27:48 +02:00
Niels Lohmann
a09bfa5faa
🔖 set version to 3.10.4 2021-10-16 13:34:31 +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
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
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
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
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
e6518ff2d6
🚧 add integer support 2021-09-04 14:54:54 +02:00
Niels Lohmann
f656f535e1
🚧 begin BON8 implementation 2021-08-31 15:04:06 +02:00
Niels Lohmann
33b674b4b2
🔖 set version to 3.10.2 2021-08-26 08:13:04 +02:00
Niels Lohmann
8ad66e9136
🔖 set version to 3.10.1 2021-08-24 20:19:55 +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
97c7a35a2b
✅ add regression test 2021-08-20 14:49:58 +02:00
Pierre Hallot
433604843d
Fix extra ";" clang warnings 2021-08-19 17:04:34 +02:00
Niels Lohmann
5a04042cad
Merge pull request #2947 from nlohmann/issue2946 
Skip some tests if JSON_Install is not set
 2021-08-18 20:06:44 +02:00
Niels Lohmann
54d9cd5a12
🔧 guard tests with JSON_Install flag 2021-08-18 13:24:12 +02:00
Niels Lohmann
5d3ad31d7e
🔥 remove outdated json_unit binary 2021-08-18 12:41:03 +02:00
Niels Lohmann
1de378f580
🔖 set version to 3.10.0 2021-08-17 15:23:23 +02:00
Niels Lohmann
8cae9d7cd2
Overwork warning flags (#2936) 
* ⚗️ update warning flags
 2021-08-17 14:43:43 +02:00
Niels Lohmann
0a0eb7a850
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00