External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,322 Commits 10 Branches 56 Tags 212 MiB
9b838a0ecb
Commit Graph

314 Commits

Author SHA1 Message Date
Niels Lohmann
11eab8a831
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-10-17 15:25:54 +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
Niels Lohmann
ab6a2c7425
🔖 set version to 3.10.3 2021-10-08 13:58:48 +02:00
Carl Smedstad
62f2997b79
Fix assertion failure for JSON_DIAGNOSTICS (#3037) 
* Fix assertion failure #3032
 2021-10-07 12:24:09 +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
d15ad85203
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/detail/meta/type_traits.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-08-30 17:34:31 +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
1de378f580
🔖 set version to 3.10.0 2021-08-17 15:23:23 +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
Ferry Huberts
364a21be6b Add coverage exclusion comments, as requested 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-13 15:30:55 +02:00
Ferry Huberts
e7a69b8d31 Adjust more files after actually building like the CI 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-13 14:00:00 +02:00
Ferry Huberts
44d60f8d14 All: fix warnings when compiling with -Wswitch-enum 
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
 2021-08-12 16:33:50 +02:00
Niels Lohmann
e20f3f95eb
🚨 guard GCC pragmas #2924 2021-08-11 23:55:46 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann
b7db1d68d9
♻️ fix CBOR and BSON 2021-08-06 14:36:38 +02:00
Sven Fink
353d59717e Add more suppressions on float comparisons 2021-08-04 08:34:53 +02:00
Niels Lohmann
3212700eb0
👌 fix code according to review comments 2021-07-22 13:24:23 +02:00
Niels Lohmann
1bd8a10225
👌 fix code according to review comments 2021-07-22 12:38:48 +02:00
Louis Dionne
b0e5965d71 Properly constrain the basic_json conversion operator 
Fixes #2491
 2021-07-19 11:16:27 -04:00
Niels Lohmann
8ba8c43707
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-07-16 08:45:53 +02:00
Niels Lohmann
80cb607e8c
🚧 fix return type 2021-07-16 08:08:26 +02:00
Niels Lohmann
3e4723a49f
🔨 remove noexcept annotation 2021-07-15 21:49:09 +02:00
Niels Lohmann
149ded856f
♻️ simplify destroy() function for primitive types 2021-07-15 12:46:48 +02:00
Niels Lohmann
a711e1f5a7
🚨 fix warnings 2021-07-13 15:37:57 +02:00
Niels Lohmann
3bb9467073
♻️ move capacity check to set_parent function 2021-07-13 15:27:27 +02:00
Niels Lohmann
bc7e8faa4f
🔥 remove duplicated line 2021-07-12 19:21:07 +02:00
Niels Lohmann
b0730f29cf
🐛 fix logics 2021-07-12 15:24:06 +02:00
Niels Lohmann
d40e98ecef
🐛 fix assertion failure #2838 2021-07-12 13:38:28 +02:00
David Pfahler
aa849a2275 Merge branch 'nlohmann:develop' into without-io 2021-06-14 08:22:49 +02:00
David Pfahler
ae9bbbc941 include io only if JSON_NO_IO is not set for #2728 2021-05-31 14:26:45 +02:00
Niels Lohmann
b27938aca3
👌 apply review comments 2021-05-04 12:47:20 +02:00
Niels Lohmann
aaef7cd2f8
👌 apply review comments 2021-05-04 12:35:07 +02:00
Niels Lohmann
eb0f8d734c
👌 apply review comments 2021-05-03 20:42:28 +02:00
Niels Lohmann
4a16e5596c
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/detail/meta/type_traits.hpp
	single_include/nlohmann/json.hpp
 2021-05-03 20:12:53 +02:00
Niels Lohmann
cdfe865486
📝 add documentation for numbers 2021-04-28 20:33:05 +02:00
Niels Lohmann
a34e011e24
Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers 
Add support for deserialization of STL containers of non-default constructable types (fixes #2574).
 2021-04-25 15:22:37 +02:00
David Pfahler
1a1381f071 Fixes #2728 
includes some macros to be defined for using without file io.
 2021-04-21 10:24:01 +02:00
raduteo
35d79203ec
Update json.hpp 2021-04-12 19:47:02 -04:00
Niels Lohmann
ea4891fb5c
👌 implement some review comments 2021-03-31 10:42:08 +02:00
Niels Lohmann
02b36e928f
⚗️ add forgotten forward 2021-03-30 10:46:00 +02:00
Niels Lohmann
69d74d4e3d
♻️ clean up 2021-03-30 08:41:44 +02:00
Niels Lohmann
0ff33d090b
👌 apply review comments 2021-03-29 22:32:54 +02:00
Niels Lohmann
203b53d7cb
💡 update documentation 2021-03-29 13:23:09 +02:00
Niels Lohmann
268600e63b
👌 apply review comments 2021-03-29 12:18:33 +02:00
Niels Lohmann
d42f37a5f8
🚧 implement operator[] for string_view 2021-03-28 14:34:14 +02:00
Niels Lohmann
d01a6a4613
🚧 add overload for erase(std::string_view) 2021-03-26 13:33:22 +01:00
Niels Lohmann
2f2c75942b
💚 fix build 2021-03-25 13:31:11 +01:00