Niels Lohmann
|
a9117828e1
|
🚨 fix warnings
|
2020-07-20 22:38:00 +02:00 |
|
Niels Lohmann
|
4a5277d09d
|
📝 update documentation
|
2020-07-20 14:11:43 +02:00 |
|
Niels Lohmann
|
8aa6da61dc
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 13:57:19 +02:00 |
|
Niels Lohmann
|
7360e09830
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 13:12:20 +02:00 |
|
Niels Lohmann
|
7cf2fe149c
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 09:42:37 +02: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 |
|
T0b1-iOS
|
281349d0d6
|
add inline specifier for detail::combine
|
2020-07-18 06:28:11 +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
|
dc06f100be
|
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
Conflicts:
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/json_sax.hpp
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/input/parser.hpp
include/nlohmann/detail/json_pointer.hpp
include/nlohmann/detail/output/serializer.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
|
2020-07-11 14:04:40 +02:00 |
|
Niels Lohmann
|
889f269a6c
|
♻️ replace further alternative operators
|
2020-07-11 13:51:25 +02:00 |
|
Niels Lohmann
|
609a0046c4
|
♻️ replace further alternative operators
|
2020-07-11 13:39:14 +02:00 |
|
Niels Lohmann
|
3a80823ff8
|
🔀 merge develop branch and resolve conflicts
|
2020-07-11 13:21:13 +02:00 |
|
Niels Lohmann
|
9c21285133
|
Merge branch 'develop' of https://github.com/nlohmann/json into issue2179
Conflicts:
single_include/nlohmann/json.hpp
|
2020-07-11 13:20:16 +02:00 |
|
gatopeich
|
f9a1fec272
|
Remove redundant comment
|
2020-07-11 00:34:02 +01:00 |
|
gatopeich
|
f62b4626be
|
Removing comment about AllocatorType per review request
|
2020-07-09 21:12:14 +01: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 |
|
Agustín F. Pozuelo
|
25f5d75e6e
|
Fix compilation for xcode 9.x
|
2020-07-03 01:44:18 +01:00 |
|
Agustín F. Pozuelo
|
93770467a1
|
Precisely 4 template arguments for the sake of clang 3.6 (?)
|
2020-07-03 01:28:54 +01:00 |
|
Agustín F. Pozuelo
|
0fc261f0f2
|
Make ordered_map compatible with GCC 5.5
|
2020-07-03 00:33:31 +01: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 |
|
gatopeich
|
49f26a0250
|
Have 4 template parameters for ordered_map
|
2020-06-29 17:32:55 +01: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
|
d7a2956b24
|
🔀 merge from develop
|
2020-06-27 13:16:20 +02:00 |
|
Niels Lohmann
|
ac3922c7aa
|
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
Conflicts:
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/lexer.hpp
include/nlohmann/detail/output/binary_writer.hpp
include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
|
2020-06-27 13:14:48 +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 |
|
Niels Lohmann
|
c5ee222982
|
Merge pull request #2211 from nlohmann/fix_warnings
Fix Clang-Tidy warnings
|
2020-06-27 12:34:18 +02:00 |
|
Niels Lohmann
|
635b9a0ae4
|
Merge pull request #2193 from dota17/issue#2059
Fix consistency in function `int_to_string()`
|
2020-06-24 11:46:48 +02:00 |
|
gatopeich
|
d08fca2bb9
|
Use const Key in ordered map
(forgotten in previous commit!)
|
2020-06-23 15:44:46 +01:00 |
|
gatopeich
|
5e7bdf1cab
|
Roll-back to hard-coded object_t::value_type
|
2020-06-23 15:39:00 +01:00 |
|
gatopeich
|
fb8c11f25c
|
Re-implement ordered_map::erase,
so that it can handle pair<const Key,...>
|
2020-06-23 15:01:20 +01:00 |
|