1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Commit Graph

811 Commits

Author SHA1 Message Date
8d1585f065 Change implementation to use templates 2018-10-03 11:44:02 +01:00
ad3c216bb5 Generate header 2018-10-03 11:27:53 +01:00
1fae82b7a7 Merge branch 'develop' into fix/1237 2018-09-29 14:50:36 +02:00
d26f39466e Merge pull request #1231 from theodelrieu/feature/get_with_parameter
Add a get overload taking a parameter.
2018-09-29 14:30:04 +02:00
e8730e5e82 BSON: Reworked binary_reader::get_bson_cstr() 2018-09-29 11:50:01 +02:00
4e54c9a13d 🚨 fixed a compilation issue with ICPC #755
Closes #1222
2018-09-29 11:48:49 +02:00
0a09db9cc2 BSON: Extend binary_reader::get_number to be able to hanlde little endian input to get rid of binary_reader::get_number_little_endian 2018-09-29 11:33:01 +02:00
521fe49fec Add basic_json::get_to function.
Takes an lvalue reference, and returns the same reference.

This allows non-default constructible types to be converted without
specializing adl_serializer.
This overload does not require CopyConstructible either.

Implements #1227
2018-09-28 11:25:23 +02:00
7a37ba0c02 Adding 4.8 test to travis 2018-09-27 22:31:39 +02:00
ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage 2018-09-25 20:34:25 +02:00
99b7c7c8ef Patch nlohmann/json for GCC 4.8
See https://github.com/nlohmann/json/pull/212 for details
2018-09-25 18:10:20 +02:00
4e52277b70 Fix issue #1237
* Make the conversion operator SFINAE correct.
* Workaround a GCC bug with some traits in type_traits.hpp

The first bullet-point implies that every `get`/`get_ptr` be SFINAE
correct as well.
2018-09-20 10:33:14 +02:00
4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently. 2018-09-18 16:38:59 -04:00
7fa3b8865c Merge pull request #1221 from rivertam/better-error-305
Better error 305
2018-09-18 12:49:07 +02:00
8f07ab6392 Replace "key-style argument" with "string argument" 2018-09-17 15:36:38 -04:00
df33a90774 BSON: Bugfix for non-empty arrays 2018-09-15 14:08:38 +02:00
cf485c2907 BSON: Support for arrays 2018-09-15 13:54:08 +02:00
120d1d77d4 BSON: test case for a more complex document 2018-09-15 13:41:05 +02:00
5ce7d6bdd7 BSON: support objects with objects as members 2018-09-15 13:03:42 +02:00
83b427ad67 BSON: unsigned integers 2018-09-15 12:20:30 +02:00
c0d8921a67 BSON: support objects with int64 members 2018-09-15 12:00:53 +02:00
7ee361f7ad BSON: support objects with int32 members 2018-09-15 11:54:17 +02:00
c5ef023171 BSON: support objects with null members 2018-09-15 11:39:12 +02:00
6c447de076 BSON: Support objects with string members 2018-09-15 11:33:24 +02:00
0c0f2e44b5 BSON: support doubles 2018-09-15 10:32:03 +02:00
9a0dddc5d2 BSON: Object with single boolean 2018-09-15 03:08:50 +02:00
5f5836ce1c BSON: Support empty objects 2018-09-15 00:43:39 +02:00
f06c8fd8e3 BSON: serialization of non-objects is not supported 2018-09-15 00:20:03 +02:00
6b5334c167 Move lambda out of unevaluated context 2018-09-10 13:34:59 +02:00
ebb3c03293 🎨 cleanup after #1228 2018-09-09 18:19:33 +02:00
aea648bb7a remove now-useless traits. check for is_basic_json where needed 2018-09-07 14:10:39 +02:00
4b4bbceebf make from_json SFINAE-correct 2018-09-07 14:10:37 +02:00
f7971f04a5 make to_json SFINAE-correct 2018-09-07 12:18:04 +02:00
f7c8a2145a refactor from/to_json(CompatibleArrayType) 2018-09-07 12:18:04 +02:00
628f76729e do not check for compatible_object_type in compatible_array_type 2018-09-07 12:18:03 +02:00
29f72966c3 refactor is_compatible_type, remove conjunction & co 2018-09-07 12:18:03 +02:00
77967e6548 refactor is_compatible_integer_type 2018-09-07 12:18:03 +02:00
13760857ff refactor is_compatible_array_type 2018-09-07 12:18:02 +02:00
924e95c6e8 refactor is_compatible_string_type 2018-09-07 12:18:02 +02:00
e84195ab7b refactor is_compatible_object_type 2018-09-07 12:18:02 +02:00
b59c3367c9 use detected instead of has_* traits 2018-09-07 12:17:59 +02:00
1ea8cd128c fix void_t for older compilers 2018-09-07 12:17:33 +02:00
eb30ff0615 🚨 fixed a compiler warning #1224 2018-09-06 07:25:19 +02:00
bbdfe7dea6 Improve error messages for error 305
Addresses #1220
2018-08-30 12:35:51 -04:00
aada309f61 Fix #1213 2018-08-24 21:55:13 +09:00
9f3857ef6f 🔖 set version to 3.2.0 2018-08-18 18:46:15 +02:00
7608a64e1e 🔨 fixed amalgamation 2018-08-18 18:14:12 +02:00
c6a482b16c 📝 added example for sax_parse 2018-08-18 15:42:18 +02:00
3811daa8a3 📝 release preparation 2018-08-18 12:00:14 +02:00
3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
The function parse_sax() returns sometimes-uninitialized warnings in
some compilers. This commit fixes that.
2018-08-18 01:12:19 +01:00