haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-20 20:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
4253 commits 13 branches 56 tags 227 MiB
Commit graph

545 commits

Author SHA1 Message Date
Niels Lohmann 524eea5887
👌 remove unused template parameter 2021-01-26 17:49:15 +01:00
Niels Lohmann 74cc0ab470
♻️ remove diagnostics_t class 2021-01-25 13:47:50 +01:00
Anthony VH 130382f2a9 Remove comment about GCC commit which didn't really relate to the code. 2021-01-24 20:02:24 +01:00
Niels Lohmann c190a72f3d
👌 apply suggestion 
Co-authored-by: Alexander Karzhenkov <karzhenkov@mail.ru>
 2021-01-24 17:45:08 +01:00
Niels Lohmann 380a613f2b
🐛 fix bug in diagnostics_t 2021-01-23 20:58:59 +01:00
Anthony VH 848927ae90 Updated comments as requested. 2021-01-23 18:24:47 +01:00
Niels Lohmann 42218cac1b
⚗️ try 9 bytes 2021-01-21 22:01:09 +01:00
Niels Lohmann d6ff059a90
👌 addressed review comments 2021-01-20 15:05:07 +01:00
Niels Lohmann 33379684b4
✅ improve coverage 2021-01-17 22:52:40 +01:00
Niels Lohmann e9d641130d
🐛 proper JSON Pointer escape in diagnostic messages 2021-01-16 15:33:05 +01:00
Niels Lohmann 29f7abf57d
🚨 fix format-truncation warning #2572 2021-01-15 17:01:47 +01:00
Niels Lohmann 0d1fb383b7
👌 address comment 2021-01-14 22:05:08 +01:00
Niels Lohmann b9d3aa4067
♻️ split set_parent function 2021-01-14 21:55:49 +01:00
Anthony VH d7c0f157c5 Merged from_json for pair and tuple to try to fix C2995 error in old MSVC versions. 2021-01-13 20:47:03 +01:00
Anthony VH 6278f31d23 Simplify from_json overloads. 2021-01-12 18:28:29 +01:00
Anthony VH 6ebf274ca0 Add internal version of is_default_constructible to work around LWG 2367. 2021-01-12 18:28:00 +01:00
Anthony VH 672e8bfc1d Fixed std::pair trying to deserialize via array functions. 2021-01-11 18:16:15 +01:00
Niels Lohmann ff57bdcc8b
🐛 fix invariants 2021-01-10 22:40:50 +01:00
Anthony VH 23f462b598 Reduced code duplication, renamed tag to identity_tag. 2021-01-10 19:23:32 +01:00
Niels Lohmann 1d6ba22f15
♻️ simplify code 2021-01-10 14:10:59 +01:00
Niels Lohmann a83404525e
🚨 fix warnings 2021-01-10 13:39:36 +01:00
Niels Lohmann e160749003
♻️ move diagnostic code in header 2021-01-09 19:21:18 +01:00
Anthony VH c0a8b45bbb Renamed template parameter and added some comments. 2021-01-09 17:45:56 +01:00
Anthony VH 1e825e4f92 Add support for deserialization of STL containers of non-default constructable types (fixes #2574). 2021-01-09 00:08:27 +01:00
Niels Lohmann ec0b1798bc
🚧 implement more parent relations 2021-01-02 21:36:11 +01:00
Niels Lohmann 7323a8eb4e
🚧 add tests 2021-01-02 16:13:04 +01:00
Niels Lohmann 7b047861b0
🚧 add diagnostics to exceptions 2021-01-02 13:44:41 +01:00
Niels Lohmann bdb2469c31
🚨 fix warnings 2020-12-29 21:36:30 +01:00
Niels Lohmann 433da31334
⚗️ try to use GCC 10 2020-12-29 20:16:51 +01:00
Niels Lohmann 98b2152452
Merge branch 'develop' of https://github.com/nlohmann/json into std_bytes 2020-12-29 14:37:46 +01:00
Jaakko Moisio 467f622c65 Fix compilation of input_adapter(container) in edge cases 
This fixes a compilation issue with the library if trying to use containers that
don't have non-member `begin()` and `end()` functions via ADL.

This patch extends the `using std::begin` and `using std::end` declarations to
also cover the return type deduction of the input_adapter() template
specialization for containers. The previous implementation only enabled the
detection of `std::begin()` and `std::end()` in the function body, making the
specialization unusable for container types that only have member `begin()` and
`end()` functions.

It is not typical to have `using` declarations in the namespace scope in a
header file. But a C++11 implementation can't rely on fully automatic return
type deduction, and needs to rely on ADL enabled helper templates. To prevent
the using declarations leaking, they are enclosed in another nested namespace.
 2020-12-28 22:21:02 +01:00
Niels Lohmann 5dd06714b1
🐛 allow parsing from std::byte containers #2546 2020-12-28 11:31:21 +01:00
Niels Lohmann dfedefb993
🚨 fix warnings 2020-12-26 17:56:16 +01:00
Niels Lohmann f15d447522
🚨 fix warnings 2020-12-26 14:55:19 +01:00
Niels Lohmann af8c6e7aa9
Merge pull request #2533 from nlohmann/c++_future 
Do not unconditionally redefine C++14 constructs
 2020-12-16 20:54:09 +01:00
Niels Lohmann 94d177e09a
📄 clarify license 2020-12-14 14:58:59 +01:00
Niels Lohmann 467986fe98
♻️ do not unconditionally redefine C++14 constructs 2020-12-14 14:31:27 +01:00
Niels Lohmann 85ffc85a29
🎨 amalgamate code 2020-12-14 10:38:49 +01:00
Niels Lohmann 3ad6992f50
Merge pull request #2405 from karzhenkov/fix-json_ref-move 
Fix move constructor of json_ref
 2020-12-11 13:36:33 +01:00
Joseph Blackman 9f45d314d5
Apply suggestions from code review 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2020-11-24 11:02:58 -08:00
jbzdarkid 64ff1cf90d Add asserts to suppress C28020 2020-10-26 13:57:38 -07:00
Alexander Karzhenkov 42a9dc0bc3 Improve json_ref implementation 2020-09-27 10:45:21 +05:00
Niels Lohmann 9d726c25d5
♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
Niels Lohmann dd8cb2acc1
🚨 remove -Wimplicit-fallthrough warning #2348 2020-08-10 20:48:39 +02:00
Niels Lohmann f4155e4727
Merge pull request #2333 from nlohmann/fallthrough 
Fix fallthrough warning
 2020-08-01 15:32:21 +02:00
Niels Lohmann 0326e4e2a6
🚨 fix fallthrough warning 2020-07-31 19:24:03 +02:00
Niels Lohmann 3888b1642a
🐛 fix lexer to properly cope with repeated comments #2330 2020-07-31 18:59:22 +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 42f8708940
Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-25 21:44:58 +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 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 480ad529e3
🐛 fix bug in CBOR tag handling 2020-07-24 14:18:39 +02:00
Niels Lohmann 33662417c1
✅ improve coverage 2020-07-24 09:32:03 +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 a33c3fdf25
Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-23 12:30:07 +02:00
Niels Lohmann 88122467bd
♻️ pull code into function 2020-07-23 12:16:18 +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 3249a4d821
Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-21 22:01:32 +02:00
Niels Lohmann b1903fff1f
💚 fix build 2020-07-21 09:09:30 +02:00
Niels Lohmann 1339d6b683
🐛 add missing EOF check 2020-07-20 22:40:28 +02:00
Niels Lohmann a9117828e1
🚨 fix warnings 2020-07-20 22:38:00 +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 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 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 8a045713ed [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
jprochazk ab25de05f7 fix: return -> result.push_back 2020-07-19 10:51:13 +02:00
jprochazk a3a9d5665e add break to binary_reader::get_binary and get_string 2020-07-19 09:35:49 +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 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 98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +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 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