4c59d6aaef
🔥 remove leftover
2020-07-16 09:43:35 +02:00
6477b9b20a
♻️ replace further alternative operators
2020-07-11 14:09:06 +02:00
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
609a0046c4
♻️ replace further alternative operators
2020-07-11 13:39:14 +02:00
98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x)
2020-07-06 12:22:31 +02:00
d7a2956b24
🔀 merge from develop
2020-06-27 13:16:20 +02:00
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
65e8ee985a
🔨 clean up
2020-06-22 08:59:03 +02:00
e22ce45065
🚸 improve diagnostics
2020-06-21 13:28:00 +02:00
0585ecc56b
✅ add tests for comment skipping
2020-06-19 13:10:35 +02:00
74520d8bb0
🚧 extend API
2020-06-17 22:03:14 +02:00
e9bfcf7255
⚡ improve comment parsing
2020-06-17 14:59:47 +02:00
b53c6e2f81
✨ ignore comments
2020-06-16 12:28:59 +02:00
6d73126ea9
🚨 fix warnings
2020-06-07 22:47:25 +02:00
907803189b
🏁 fix MSVC 2015 compilation
2020-06-07 12:51:33 +02:00
bf2e714e96
🚨 fix warnings
2020-06-06 14:30:17 +02:00
0498202a03
🎨 replace alternative operators (and, not, or)
2020-06-03 14:20:36 +02:00
23051df2c7
Cast character to unsigned for comparison
2020-05-27 13:15:31 +02:00
a4266bbb7d
Merge branch 'develop' into issues/1457
2020-05-13 12:48:46 +02:00
6815968a42
Fix error message about invalid surrogate pairs
...
I tested following strings with invalid surrogate pair and unpaired surrogate in files:
1. `"a\uD800\uD800x"`
2. `"a\uD800x"`
The error messge was: "... invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; ..."
I think it must be: "... invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; ..."
2020-05-01 00:23:04 +03:00
2e2cf02cfd
duck-typed object input adapters
2020-02-19 14:59:31 -05:00
617b3cf42e
templated input adapters
2020-02-19 10:32:49 -05:00
0feea6168d
📝 fix scanner documentation
2020-01-12 10:22:11 +01:00
947656544d
🚨 fix warnings
2019-07-02 21:06:42 +02:00
346e9813c5
🚧 add more annotations
2019-07-02 20:25:51 +02:00
90798caa62
🚚 rename Hedley macros
2019-07-01 22:37:30 +02:00
897362191d
🔨 add NLOHMANN_JSON prefix and undef macros
2019-07-01 22:24:39 +02:00
1720bfedd1
⚗️ add Hedley annotations
2019-06-30 22:14:02 +02:00
7c55510f76
🚨 fixed some warnings #1527
2019-03-20 11:06:39 +01:00
8d3f4f21bc
🔨 clean up
2019-03-18 13:53:48 +01:00
b8451c236f
🚨 fixed warnings
2019-03-17 12:01:49 +01:00
34f8b4f711
🚨 fixed more warnings
2019-03-17 00:27:44 +01:00
b02ee16721
🚨 fixed warnings
2019-03-15 15:55:52 +01:00
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
c682b9879b
🚨 fixed PVS V567 warning
...
"V567 The modification of the 'position.chars_read_current_line' variable is unsequenced relative to another operation on the same variable. This may lead to undefined behavior."
2018-12-30 23:00:15 +01:00
da81e7be22
🏁 adding parentheses around std::snprintf calls #1337
2018-11-09 21:18:02 +01:00
e426219256
Merge pull request #1282 from nlohmann/feature/lines_columns
...
Improve diagnostic messages
2018-10-08 22:17:33 +02:00
6e49d9f5ff
🚑 fixed compilation error
2018-10-07 21:34:40 +02:00
3abb788139
🚨 fixed some more clang-tidy warnings
2018-10-07 19:07:58 +02:00
858e75c4df
🚨 fixed some clang-tidy warnings
2018-10-07 18:39:18 +02:00
6d09cdec34
🐛 fixed a bug in the unget function
2018-10-07 16:48:45 +02:00
011b15dd08
♿ added line positions to error messages
...
This is a follow-up to #1210 .
2018-10-07 12:27:24 +02:00
ec95438a59
🚨 fixed some linter warnings
2018-10-06 13:49:02 +02:00
3811daa8a3
📝 release preparation
2018-08-18 12:00:14 +02:00
be2065dce9
🚨 fixing a MinGW warning #1192
2018-08-14 22:11:47 +02:00
66dd1a846d
🚨 fixed more compiler warnings
2018-06-23 10:47:55 +02:00
850922269d
🚨 removed compiler warnings
2018-06-23 10:28:04 +02:00
64acb42aa7
remove stringstream dependency
2018-05-31 13:45:58 +02:00
aa89c5e048
🔨 removing unget_character() function from input adapters #834
2018-04-02 21:10:48 +02:00
4f6b2b6429
🔨 changed SAX interface
2018-03-21 20:12:06 +01:00
Niels Lohmann
Tobias Kux
Niels Lohmann
Rimas Misevičius
Francois Chabot
Matthias Möller