1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-19 17:03:16 +03:00
Commit Graph

784 Commits

Author SHA1 Message Date
3335da622a remove non usefull code. 2018-12-12 09:32:52 -05:00
67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library. 2018-12-11 09:33:30 -05:00
2c23f0a346 Changes requested from code review. 2018-12-08 15:46:33 +00:00
ef90d62ddf 🚨 fixed warning #1364 2018-11-21 21:17:38 +01:00
da81e7be22 🏁 adding parentheses around std::snprintf calls #1337 2018-11-09 21:18:02 +01:00
f80efd3954 💄 cleanup 2018-11-09 21:10:32 +01:00
35829928da Merge pull request #1343 from mefyl/develop
Set eofbit on exhausted input stream.
2018-11-09 21:07:36 +01:00
aa10382629 Set eofbit on exhausted input stream.
Fix issue #1340.

        The eofbit is set manually since we don't go through the
	stream interface. We could maybe use the stream interface
	instead, but there are some assumptions regarding which
	exception go through, so this seems to be the most prudent
	approach for now.
2018-11-08 11:41:17 +01:00
798754dfb6 Amalgamate Headers 2018-11-08 10:35:45 +01:00
f665a92330 Implement SFINAE friendly iterator_traits and use that instead. 2018-11-07 18:39:25 +00:00
2f73a4d1f3 🚨 fixed a linter warning 2018-10-31 20:30:24 +01:00
7b2f8cce03 🔖 set version to 3.4.0 2018-10-30 21:30:20 +01:00
8cee0e38d9 🚑 fixed #1319 2018-10-30 17:29:05 +01:00
856fc31d0a 💄 fixed indentation 2018-10-29 19:44:19 +01:00
d2e4f0b0d9 ✏️ fixed some typos 2018-10-28 14:20:20 +01:00
f0c1459554 🐛 fixed a bug parsing BSON strings #1320 2018-10-28 09:16:40 +01:00
24946f67f1 🚨 fixed some more linter warnings 2018-10-28 09:15:41 +01:00
7d0dc10169 🚨 fixed a linter warning 2018-10-27 18:34:35 +02:00
45a761bd60 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-10-27 18:31:06 +02:00
4e765596f7 🔨 small improvements 2018-10-27 18:31:03 +02:00
1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char
Properly convert constants to CharType
2018-10-27 16:56:00 +02:00
85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping 2018-10-27 16:52:59 +02:00
5a6bdf5934 Merge branch 'develop' into feature/convert_char 2018-10-27 16:48:48 +02:00
9f48bb6937 replaced vector by array #1323 2018-10-27 09:58:23 +02:00
6384fe28db 🚨 fixed another linter warning 2018-10-26 23:12:41 +02:00
ad639ad5e6 added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 2018-10-26 14:48:20 +02:00
544150d5a5 🚨 fixed another linter warning 2018-10-26 11:10:49 +02:00
c2e175763c 👌 added another conversion function #1315 2018-10-25 22:47:08 +02:00
7ce720b700 🚨 fixed coverage 2018-10-25 18:21:50 +02:00
19647e083c 🚨 fixed compiler warnings 2018-10-25 14:27:55 +02:00
62126278a6 🔨 added fix for arrays 2018-10-25 13:01:18 +02:00
1968e5c793 🎨 clean up binary formats 2018-10-24 23:39:30 +02:00
e2c5913a50 🚧 some changes to the BSON code
- added fuzz testers
- added some reference files
- made an exception text more clear
2018-10-24 15:43:37 +02:00
bba159121f Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson 2018-10-24 15:03:15 +02:00
7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors
Allow to set error handler for decoding errors
2018-10-24 08:40:58 +02:00
20038e2703 📝 added a note to the discussion #1286 2018-10-23 23:00:43 +02:00
87ef3f25f2 ✏️ fixed a typo #1314 2018-10-23 22:56:10 +02:00
b49f76931f 👌 replaced static_cast to CharType by conversion function #1286 2018-10-23 17:49:04 +02:00
c51b1e6fab 🚧 fixed an issue with ensure_ascii #1198 2018-10-22 15:53:36 +02:00
c7af027cbb 🚧 respect ensure_ascii parameter #1198 2018-10-22 09:18:16 +02:00
e5dce64115 💚 added tests #1198
Test every prefix of Unicode sequences against the different dump functions.
2018-10-21 23:26:25 +02:00
c5821d91e5 🚧 overworked error handlers #1198 2018-10-21 11:49:37 +02:00
ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of out_of_range.409-message 2018-10-18 20:05:46 +02:00
9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299
add new is_constructible_* traits used in from_json
2018-10-18 19:18:48 +02:00
8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() 2018-10-17 21:47:01 +02:00
2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp
2018-10-17 20:26:00 +02:00
dbb0b63187 improved error messages for binary formats #1288
This commit is the equivalent of #1282 for CBOR, MessagePack, and UBJSON.
2018-10-17 12:15:58 +02:00
a946dfc19c add a note to maintainers in type_traits.hpp 2018-10-17 12:03:10 +02:00
978c3c4116 BSON: throw json.exception.out_of_range.409 in case a key to be serialized to BSON contains a U+0000 2018-10-16 20:42:00 +02:00
0671e92ced 🚧 proposal for different error handlers #1198
Proof of concept; currently only as parameter to the internal dump_escaped function; that is, not yet exposed to the dump function.
2018-10-16 20:38:50 +02:00