Carl Smedstad
62f2997b79
Fix assertion failure for JSON_DIAGNOSTICS ( #3037 )
...
* Fix assertion failure #3032
2021-10-07 12:24:09 +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
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
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
Pierre Hallot
433604843d
Fix extra ";" clang warnings
2021-08-19 17:04:34 +02:00
Niels Lohmann
cfb71ad1bf
🐛 adding missing header
2021-08-18 13:33:35 +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
1aceeff3fc
🚨 fix C4244 warning
2021-08-14 13:40:52 +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
cdbc50b9a8
Again forgot to amalgate (sigh)
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 15:33:05 +02:00
Ferry Huberts
95b73bcd01
Forgot to amalgate
...
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2021-08-13 14:22:18 +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
8ae31a56a5
Merge branch 'develop' of https://github.com/nlohmann/json into issue2824
2021-08-11 08:06:32 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation
2021-08-08 13:24:17 +02:00
Niels Lohmann
a4c3cf7798
💚 fix MSVC build
2021-08-07 13:40:01 +02:00
Niels Lohmann
89c98dfc20
✨ add option to process binary subtypes in CBOR
2021-08-06 16:41:01 +02:00
Niels Lohmann
b7db1d68d9
♻️ fix CBOR and BSON
2021-08-06 14:36:38 +02:00
Niels Lohmann
046df035fa
♻️ change type of binary subtype
2021-08-06 13:45:35 +02:00
Niels Lohmann
3eb1fb6be7
♻️ change type of binary subtype
2021-08-06 13:26:00 +02:00
Niels Lohmann
5c38e76c11
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863
2021-08-06 13:23:26 +02:00
Sven Fink
353d59717e
Add more suppressions on float comparisons
2021-08-04 08:34:53 +02:00
Sven Fink
095aae19fe
Supress -Wfloat-equal on intended float comparisions
2021-08-03 08:58:38 +02:00
Niels Lohmann
7c19aa2210
♻️ overwork byte_container_with_subtype
2021-08-01 22:00:57 +02:00
Niels Lohmann
c3df4ffd5a
🚨 fix warning
2021-08-01 14:08:14 +02:00
Niels Lohmann
9a459e1bd5
🚨 fix useless-cast warnings
2021-07-30 15:20:22 +02:00
Niels Lohmann
7feb2c20cf
🚨 fix useless-cast warnings
2021-07-30 14:48:25 +02:00
Niels Lohmann
a563338039
Merge pull request #2825 from ldionne/ldionne-lazy
...
Properly constrain the basic_json conversion operator
2021-07-22 12:24:56 +02:00
Louis Dionne
b0e5965d71
Properly constrain the basic_json conversion operator
...
Fixes #2491
2021-07-19 11:16:27 -04:00
Niels Lohmann
7066ab128f
🎨 reindent code
2021-07-19 16:56:28 +02:00
Niels Lohmann
b7cc47089f
⚡ avoid string in case of empty objects
2021-07-16 09:27:18 +02:00
Niels Lohmann
c89e23c69b
Merge pull request #2874 from nlohmann/issue2572
...
Fix truncation warning
2021-07-16 07:54:48 +02:00
Niels Lohmann
953dcfb611
🚨 fix warning #2572
2021-07-15 22:00:16 +02:00
Niels Lohmann
3e4723a49f
🔨 remove noexcept annotation
2021-07-15 21:49:09 +02:00
Niels Lohmann
ecaac22656
💡 add comment to describe j.m_value.destroy(j.m_type) calls
2021-07-15 20:34:50 +02:00
Niels Lohmann
f6863e062c
🐛 fix leak for all types
2021-07-15 20:32:37 +02:00
Niels Lohmann
0011cd1b72
🐛 fix leak for strings
2021-07-15 13:12:21 +02:00
Niels Lohmann
0f8666ecdc
🐛 fix leak for strings
2021-07-15 13:03:20 +02:00
Niels Lohmann
6cbdc83994
🐛 fix leak for strings
2021-07-15 12:47:15 +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