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
|
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
|
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
|
176e9bf0ab
|
✅ add tests for CBOR
|
2021-08-07 13:14:08 +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
|
996ac1c017
|
Merge branch 'develop' of https://github.com/nlohmann/json into issue2572
Conflicts:
include/nlohmann/detail/output/serializer.hpp
single_include/nlohmann/json.hpp
|
2021-07-15 21:57:52 +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
|
c1298e69a6
|
🐛 fix leak for strings
|
2021-07-15 12:52:17 +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 |
|
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
|
b08139ea4b
|
♻️ replace EOF with std::char_traits<char>::eof()
|
2021-05-04 10:22:34 +02:00 |
|
Niels Lohmann
|
d0ab2b86c3
|
📝 update documentation
|
2021-04-29 17:19:57 +02:00 |
|
Niels Lohmann
|
8a29a6ecf4
|
Merge pull request #2731 from theShmoo/custom-cpp-version
Fixes #2730
|
2021-04-29 09:55:16 +02:00 |
|
Niels Lohmann
|
cdfe865486
|
📝 add documentation for numbers
|
2021-04-28 20:33:05 +02:00 |
|
David Pfahler
|
5a77314c5e
|
replaced define
JSON_VERSION_IS_PREDEFINED with JSON_HAS_CPP_11
|
2021-04-26 08:09:36 +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
|
31c4c8f36c
|
Fixes #2730
Added define JSON_VERSION_IS_PREDEFINED
for skipping automatic JSON_HAS_CPP_* detection
|
2021-04-21 11:03:28 +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 |
|
Anthony VH
|
2b865131d8
|
Fixing CI errors.
|
2021-03-24 23:33:21 +01:00 |
|