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
3967 commits 13 branches 56 tags 227 MiB
Commit graph

225 commits

Author SHA1 Message Date
Niels Lohmann ff57bdcc8b
🐛 fix invariants 2021-01-10 22:40:50 +01:00
Niels Lohmann e160749003
♻️ move diagnostic code in header 2021-01-09 19:21:18 +01:00
Niels Lohmann ec0b1798bc
🚧 implement more parent relations 2021-01-02 21:36:11 +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 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 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
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
aodq 12885446d8 fixes unused variable 'ex' for #2304 2020-07-23 13:21:38 -04: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 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 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
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
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 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 3952739189
✨ add CBOR tag handler #1968 2020-07-12 16:51:43 +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 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
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 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 8b3d2399a4
🚨 remove warnings 2020-06-22 22:32:21 +02:00
Niels Lohmann 65e8ee985a
🔨 clean up 2020-06-22 08:59:03 +02:00
Niels Lohmann e22ce45065
🚸 improve diagnostics 2020-06-21 13:28:00 +02:00
Niels Lohmann 0585ecc56b
✅ add tests for comment skipping 2020-06-19 13:10:35 +02:00
Niels Lohmann 74520d8bb0
🚧 extend API 2020-06-17 22:03:14 +02:00
Niels Lohmann e9bfcf7255
⚡ improve comment parsing 2020-06-17 14:59:47 +02:00
Niels Lohmann b53c6e2f81
✨ ignore comments 2020-06-16 12:28:59 +02:00
Niels Lohmann ae04426c85
🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) 2020-06-08 20:07:15 +02:00