haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
2881 commits 11 branches 56 tags 222 MiB
Commit graph

2881 commits

This branch
This branch
All branches
Author SHA1 Message Date
mandreyel 6b5334c167 Move lambda out of unevaluated context 2018-09-10 13:34:59 +02:00
Niels Lohmann ebb3c03293
🎨 cleanup after #1228 2018-09-09 18:19:33 +02:00
Niels Lohmann d3428b35c5
Merge pull request #1228 from theodelrieu/remove_static_asserts 
Remove static asserts
 2018-09-09 18:12:43 +02:00
Théo DELRIEU aea648bb7a
remove now-useless traits. check for is_basic_json where needed 2018-09-07 14:10:39 +02:00
Théo DELRIEU 4b4bbceebf
make from_json SFINAE-correct 2018-09-07 14:10:37 +02:00
Théo DELRIEU f7971f04a5
make to_json SFINAE-correct 2018-09-07 12:18:04 +02:00
Théo DELRIEU f7c8a2145a
refactor from/to_json(CompatibleArrayType) 2018-09-07 12:18:04 +02:00
Théo DELRIEU 628f76729e
do not check for compatible_object_type in compatible_array_type 2018-09-07 12:18:03 +02:00
Théo DELRIEU 29f72966c3
refactor is_compatible_type, remove conjunction & co 2018-09-07 12:18:03 +02:00
Théo DELRIEU 77967e6548
refactor is_compatible_integer_type 2018-09-07 12:18:03 +02:00
Théo DELRIEU 13760857ff
refactor is_compatible_array_type 2018-09-07 12:18:02 +02:00
Théo DELRIEU 924e95c6e8
refactor is_compatible_string_type 2018-09-07 12:18:02 +02:00
Théo DELRIEU e84195ab7b
refactor is_compatible_object_type 2018-09-07 12:18:02 +02:00
Théo DELRIEU b59c3367c9
use detected instead of has_* traits 2018-09-07 12:17:59 +02:00
Théo DELRIEU 1ea8cd128c
fix void_t for older compilers 2018-09-07 12:17:33 +02:00
Niels Lohmann eb30ff0615
🚨 fixed a compiler warning #1224 2018-09-06 07:25:19 +02:00
Ben Berman ad053ef09c Fix tests for improved error 305(hopefully) 2018-08-30 13:21:55 -04:00
Ben Berman bbdfe7dea6 Improve error messages for error 305 
Addresses #1220
 2018-08-30 12:35:51 -04:00
Niels Lohmann d713727f22
Merge pull request #1202 from dennisfischer/develop 
Export package to allow builds without installing
 2018-08-25 10:56:30 +02:00
Niels Lohmann 04597c3a66
Merge pull request #1214 from devsisters/fix-1213 
Fix #1213
 2018-08-24 17:54:28 +02:00
Hyeon Kim aada309f61
Fix #1213 2018-08-24 21:55:13 +09:00
Niels Lohmann 359f98d140
Merge branch 'release/3.2.0' into develop 2018-08-20 19:36:25 +02:00
Dennis Fischer dfe607c6ff Export package to allow builds without installing 2018-08-20 09:23:12 +02:00
Niels Lohmann 9f3857ef6f
🔖 set version to 3.2.0 2018-08-18 18:46:15 +02:00
Niels Lohmann 7608a64e1e
🔨 fixed amalgamation 2018-08-18 18:14:12 +02:00
Niels Lohmann a7b02bdce0
🔖 preparing 3.2.0 release 2018-08-18 17:48:49 +02:00
Niels Lohmann c6a482b16c
📝 added example for sax_parse 2018-08-18 15:42:18 +02:00
Niels Lohmann 5ad52f4167
⬆️ Catch 1.12.0 2018-08-18 12:02:12 +02:00
Niels Lohmann 3811daa8a3
📝 release preparation 2018-08-18 12:00:14 +02:00
Niels Lohmann 6899fa304c
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-08-18 08:15:06 +02:00
Niels Lohmann 57faaf42ca
🚨 fixed a compiler warning 2018-08-18 08:15:03 +02:00
Niels Lohmann f78ac4fbd3
Merge pull request #1200 from thyu/develop 
Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
 2018-08-18 08:14:04 +02:00
Tsz-Ho Yu 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
Niels Lohmann e33b31e6aa
🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) 2018-08-17 23:09:45 +02:00
Niels Lohmann b5c54b41fd
📝 overworked documentation 2018-08-16 21:53:47 +02:00
Niels Lohmann 07494e06d7
🚨 fixed some compiler warnings 2018-08-16 18:20:30 +02:00
Niels Lohmann d5b21b051c
Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax 
Refactor/no virtual sax
 2018-08-16 17:47:55 +02:00
Théo DELRIEU 0cc3db4f15
add static_asserts on SAX interface 2018-08-16 11:59:57 +02:00
Théo DELRIEU 38f8a51a8f
use abstract sax class in parser tests 2018-08-16 11:59:49 +02:00
Théo DELRIEU 9bbb133094
remove no_limit constant and default values 2018-08-16 11:59:05 +02:00
Théo DELRIEU 442886d040
use templates in the sax interface instead of virtuals 2018-08-16 11:58:52 +02:00
Théo DELRIEU f6febbe359
split meta.hpp, add detected_t (used to define concepts) 2018-08-16 11:58:42 +02:00
Niels Lohmann 3ac2d81a95
🔨 fixed a MinGW error #1193 2018-08-14 22:13:56 +02:00
Niels Lohmann be2065dce9
🚨 fixing a MinGW warning #1192 2018-08-14 22:11:47 +02:00
Niels Lohmann fed70f6bff
🎨 reindented code 2018-08-14 22:11:08 +02:00
Niels Lohmann 0e748f2f8c
Merge pull request #1187 from devsisters/json-internal-catch 
[RFC] Introduce a new macro function: JSON_INTERNAL_CATCH
 2018-08-14 21:56:29 +02:00
Niels Lohmann 861ee400cc
Merge pull request #1176 from grembo/develop 
Fix unit tests that were silently skipped or crashed (depending on the compiler)
 2018-08-14 21:48:49 +02:00
Niels Lohmann 3ce4325350
📝 updated documentation of used compilers 2018-08-01 22:31:51 +02:00
Niels Lohmann ba4a19d4af
👷 added more CI workers 2018-08-01 20:59:58 +02:00
Niels Lohmann 043eff5ba8
👷 added more CI workers 2018-07-31 21:18:33 +02:00