Niels Lohmann
|
67ed63b196
|
Merge pull request #2312 from nlohmann/docs
Update documentation
|
2020-07-26 10:06:01 +02:00 |
|
Niels Lohmann
|
808aca41aa
|
Merge pull request #2305 from AODQ/develop
fixes unused variable 'ex' for #2304
|
2020-07-25 21:51:54 +02:00 |
|
Niels Lohmann
|
1816aae862
|
Merge branch 'develop' of https://github.com/nlohmann/json into docs
|
2020-07-25 21:48:51 +02:00 |
|
Niels Lohmann
|
980f8c6f61
|
🔀 merge develop branch
|
2020-07-25 21:45:47 +02:00 |
|
Niels Lohmann
|
40b78d3847
|
Merge pull request #2308 from nlohmann/cbor_tags
Fix bug in CBOR tag handling
|
2020-07-25 19:43:11 +02:00 |
|
Niels Lohmann
|
fad14aabe7
|
📝 update output of meta function
|
2020-07-25 14:41:06 +02:00 |
|
Niels Lohmann
|
62f98b7537
|
Merge branch 'develop' of https://github.com/nlohmann/json into docs
|
2020-07-25 11:20:13 +02:00 |
|
Niels Lohmann
|
c00c3162b2
|
Merge branch 'develop' into develop
|
2020-07-25 10:52:42 +02:00 |
|
aodq
|
15ec0fe150
|
change c-style cast to static_cast for #2304
|
2020-07-24 16:21:30 -04:00 |
|
Niels Lohmann
|
d8d499ce9b
|
📝 add more documentation
|
2020-07-24 14:35:52 +02:00 |
|
Niels Lohmann
|
480ad529e3
|
🐛 fix bug in CBOR tag handling
|
2020-07-24 14:18:39 +02:00 |
|
Jonas Wittbrodt
|
0f22ed0b5b
|
added inline to DEFINE_TYPE macro
|
2020-07-23 19:24:21 +02:00 |
|
aodq
|
12885446d8
|
fixes unused variable 'ex' for #2304
|
2020-07-23 13:21:38 -04:00 |
|
Niels Lohmann
|
230dcfb7a3
|
🚨 add prefix to avoid shadowing
|
2020-07-23 12:57:52 +02:00 |
|
Niels Lohmann
|
a048b72fe1
|
Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator
Feat/explicit conversion operator
|
2020-07-23 08:52:51 +02:00 |
|
Théo DELRIEU
|
74b446f5fd
|
add a switch to enable implicit conversions (defaults to true)
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
|
2020-07-22 10:49:01 +02:00 |
|
Niels Lohmann
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +02:00 |
|
Niels Lohmann
|
8344857764
|
Merge pull request #2287 from pfeatherstone/develop
Serialisation macros: increase upper bound on number of member variables
|
2020-07-20 21:35:55 +02:00 |
|
Niels Lohmann
|
893eda8353
|
Merge pull request #2294 from jprochazk/develop
fix eof for get_binary and get_string
|
2020-07-20 08:02:03 +02:00 |
|
pf
|
0b744e1ed0
|
[JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
- used code to increase the upper bound on number of member variables to 64
|
2020-07-19 17:26:56 +01:00 |
|
Niels Lohmann
|
b1da58b76b
|
Merge pull request #2282 from nlohmann/missing_sax_check
Add static assertion for missing binary function in SAX interface
|
2020-07-19 18:09:08 +02:00 |
|
jprochazk
|
d371a5283c
|
run amalgamate
|
2020-07-19 10:57:17 +02:00 |
|
T0b1-iOS
|
88243b3f8c
|
run amalgamate
|
2020-07-18 07:09:56 +02:00 |
|
Niels Lohmann
|
7fc4b2901a
|
🚸 add static assertion for missing binary function in SAX interface
|
2020-07-17 20:41:11 +02:00 |
|
Niels Lohmann
|
a10d486e36
|
Merge pull request #2244 from matthewbauer/tag-cbor
Tag binary values in cbor if set
|
2020-07-17 14:05:48 +02:00 |
|
Niels Lohmann
|
e65cc9dccb
|
Merge pull request #2274 from nlohmann/analyzers
Clean up maintainer Makefiles and fix some linter warnings
|
2020-07-17 14:01:19 +02:00 |
|
Niels Lohmann
|
548e7e54c9
|
Merge pull request #2273 from nlohmann/issue1968
Add option to ignore CBOR tags
|
2020-07-17 13:59:55 +02:00 |
|
Niels Lohmann
|
6023a7ccd9
|
Merge branch 'develop' into analyzers
|
2020-07-17 13:59:32 +02:00 |
|
Niels Lohmann
|
d047b3d495
|
🚨 remove linter warning
|
2020-07-16 14:45:39 +02:00 |
|
Niels Lohmann
|
4c59d6aaef
|
🔥 remove leftover
|
2020-07-16 09:43:35 +02:00 |
|
Niels Lohmann
|
b821ed074f
|
💡 add documentation
|
2020-07-15 13:45:16 +02:00 |
|
Niels Lohmann
|
9449dfcc6a
|
💚 add test cases for hash
|
2020-07-15 09:27:01 +02:00 |
|
Niels Lohmann
|
33b0bed7fe
|
💚 fix compilation
|
2020-07-14 14:34:55 +02:00 |
|
Niels Lohmann
|
5b229f4cce
|
⚡ hash function without allocation
|
2020-07-14 14:31:19 +02:00 |
|
Niels Lohmann
|
3952739189
|
✨ add CBOR tag handler #1968
|
2020-07-12 16:51:43 +02:00 |
|
Niels Lohmann
|
e316f5c5b6
|
Merge pull request #2258 from nlohmann/issue2179
Add ordered_json specialization with ordered object keys
|
2020-07-12 13:11:23 +02:00 |
|
Niels Lohmann
|
8d295235a5
|
🔥 remove unused boolean_operators.hpp header
|
2020-07-11 19:20:44 +02:00 |
|
Niels Lohmann
|
6477b9b20a
|
♻️ replace further alternative operators
|
2020-07-11 14:09:06 +02:00 |
|
Niels Lohmann
|
7f923424b3
|
🔀 merge develop branch and resolve conflicts
|
2020-07-11 14:05:02 +02:00 |
|
Niels Lohmann
|
3a80823ff8
|
🔀 merge develop branch and resolve conflicts
|
2020-07-11 13:21:13 +02:00 |
|
Niels Lohmann
|
4c7bd014d9
|
Merge pull request #2242 from nlohmann/issue2239
Make assert configurable via JSON_ASSERT
|
2020-07-09 15:13:12 +02:00 |
|
Niels Lohmann
|
e3e9ccfc02
|
🚑 fix regression from #2181
|
2020-07-08 14:02:28 +02:00 |
|
Niels Lohmann
|
98b1c6d302
|
🚩 use JSON_ASSERT(x) instead of assert(x)
|
2020-07-06 12:22:31 +02:00 |
|
Niels Lohmann
|
b04dc055b2
|
Merge pull request #2233 from nlohmann/issue2175
Add specialization of get_to
|
2020-07-06 07:58:52 +02:00 |
|
Matthew Bauer
|
e54f03f73b
|
Tag binary values in cbor if set
CBOR has tags, which work similarly to "subtype"s:
https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml
Unsure if this makes sense. Note that the subtype must just be one
byte wide.
|
2020-07-02 17:40:02 -04:00 |
|
Niels Lohmann
|
c7e079cc98
|
🚑 add specialization of get_to #2175
|
2020-06-30 14:26:52 +02:00 |
|
Niels Lohmann
|
ad6eadeb70
|
📝 refine documentation of error_handler parameter
|
2020-06-30 13:59:43 +02:00 |
|
Niels Lohmann
|
eb7376bb13
|
Merge pull request #2225 from nlohmann/issue2175
Simplify conversion from/to custom types
|
2020-06-29 14:41:09 +02:00 |
|
Niels Lohmann
|
fa9f4040df
|
🔥 remove unused typedefs #2221
|
2020-06-27 13:07:02 +02:00 |
|
Niels Lohmann
|
3948b5b091
|
Merge pull request #2212 from nlohmann/comments
Add option to ignore comments in parse/accept functions
|
2020-06-27 12:44:51 +02:00 |
|