Niels Lohmann
|
480ad529e3
|
🐛 fix bug in CBOR tag handling
|
2020-07-24 14:18:39 +02:00 |
|
Niels Lohmann
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +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 |
|
Niels Lohmann
|
6d73126ea9
|
🚨 fix warnings
|
2020-06-07 22:47:25 +02:00 |
|
Niels Lohmann
|
907803189b
|
🏁 fix MSVC 2015 compilation
|
2020-06-07 12:51:33 +02:00 |
|
Niels Lohmann
|
bf2e714e96
|
🚨 fix warnings
|
2020-06-06 14:30:17 +02:00 |
|
Niels Lohmann
|
7444c7fa25
|
Merge pull request #2145 from FrancoisChabot/1813-user-input
Fix Issue#1813: user defined input adapters
|
2020-06-05 14:30:39 +02:00 |
|
Niels Lohmann
|
0498202a03
|
🎨 replace alternative operators (and, not, or)
|
2020-06-03 14:20:36 +02:00 |
|
chenguoping
|
4350c5ed97
|
fix bug in issue#1972
|
2020-05-30 17:15:56 +08:00 |
|
Francois Chabot
|
7646253940
|
fix inconsistent fwd declaration
|
2020-05-28 12:20:02 -04:00 |
|
Francois Chabot
|
dcf6175978
|
use the correct convention for boolean operators
|
2020-05-28 09:29:38 -04:00 |
|
Niels Lohmann
|
61832afe15
|
Merge pull request #2144 from XyFreak/gcc10_type_limits
Fix issue#1939: Cast character to unsigned for comparison
|
2020-05-28 12:59:57 +02:00 |
|
Francois Chabot
|
76b49f9ee6
|
misc formatting fixes
|
2020-05-28 02:29:53 -04:00 |
|
Francois Chabot
|
377995f495
|
forcefully exclude arrays from being interpreted as pointers
|
2020-05-27 18:21:38 -04:00 |
|
Francois Chabot
|
b9416a26aa
|
correct ADL lookup of arrays on Mac and Windows
|
2020-05-27 13:21:23 -04:00 |
|
Francois Chabot
|
5684d9a498
|
unified input API
|
2020-05-27 12:40:04 -04:00 |
|
Tobias Kux
|
23051df2c7
|
Cast character to unsigned for comparison
|
2020-05-27 13:15:31 +02:00 |
|
Niels Lohmann
|
225fa58f16
|
🚧 add fix from #1715
|
2020-05-20 22:20:40 +02:00 |
|
Niels Lohmann
|
904642f261
|
♻️ rename internal_binary_t with binary_t
|
2020-05-17 22:50:27 +02:00 |
|
Niels Lohmann
|
dead99eb0e
|
🔨 overwork binary subtypes
|
2020-05-17 13:51:59 +02:00 |
|
Niels Lohmann
|
ab6e76dd05
|
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type
|
2020-05-17 12:27:58 +02:00 |
|
Niels Lohmann
|
28e20bd9e4
|
🚨 fix warnings #2113
|
2020-05-16 14:26:17 +02:00 |
|
Niels Lohmann
|
bc1886fb60
|
♻️ refine interface of wrapped_binary_t
|
2020-05-15 23:21:49 +02:00 |
|
Niels Lohmann
|
daf2d296dd
|
♻️ move wrapped binary type to separate file
|
2020-05-15 14:12:32 +02:00 |
|
Niels Lohmann
|
0857140839
|
Merge pull request #1950 from FrancoisChabot/issues/1457
templated input adapters
|
2020-05-14 07:52:02 +02:00 |
|
Niels Lohmann
|
d7b032f565
|
✅ add tests to improve coverage
|
2020-05-13 21:28:43 +02:00 |
|
Niels Lohmann
|
a4266bbb7d
|
Merge branch 'develop' into issues/1457
|
2020-05-13 12:48:46 +02:00 |
|
Niels Lohmann
|
5c42847011
|
✅ add tests for binary type
|
2020-05-10 13:23:18 +02:00 |
|
Niels Lohmann
|
fff46ea98c
|
✅ add tests for binary type
|
2020-05-09 23:18:12 +02:00 |
|