Commit Graph

1181 Commits

Author SHA1 Message Date
Théo DELRIEU
a94b336f5f Merge b81c2a22ea into 0d72767b3e 2016-11-20 03:57:06 +00:00
Niels
0d72767b3e ⬆️ updated to Catch v1.5.8 2016-11-16 19:15:54 +01:00
Niels
56667af823 🎨 stating the name of the library in the license 2016-11-16 19:08:25 +01:00
Niels
425b9834a8 🐛 removed the wrong compiler 2016-11-16 08:25:08 +01:00
Niels
56671a88c6 🍎 removed Xcode 8.0 due to repeated problems 2016-11-16 08:01:48 +01:00
Niels
5316f0fff2 🍎 added Xcode 8.1 build for travis 2016-11-16 06:42:26 +01:00
Niels
9ca00e4880 readded missing header 2016-11-03 07:27:32 +01:00
Niels
e385417047 documented and cleaned up headers (#314) 2016-11-02 21:27:19 +01:00
Niels
6d2b5e3771 Merge branch 'release/2.0.7' into develop 2016-11-02 20:52:42 +01:00
Niels
700977d73e version bump 2016-11-02 20:52:15 +01:00
Niels
79015b9d0a Merge branch 'feature/jsontestsuite' into develop 2016-11-02 17:03:17 +01:00
Niels
3716a2fbe8 Merge branch 'develop' into feature/jsontestsuite 2016-11-02 17:03:12 +01:00
Niels
737d43724f Merge branch 'feature/issue329' into develop 2016-11-02 16:59:23 +01:00
Niels
59c8343851 cleanup 2016-11-02 15:44:46 +01:00
Niels
94c16b2c31 fixed coverage 2016-11-01 17:01:04 +01:00
Niels
8f70525374 more test coverage 2016-10-30 17:46:00 +01:00
Niels
7adccde714 improved coverage and updated README 2016-10-30 17:10:11 +01:00
Niels
8d1e65f297 evaluated i-tests (#344) 2016-10-30 16:07:17 +01:00
Niels
7b4e6cf705 added implementation-specific tests (#344) 2016-10-30 12:08:29 +01:00
Niels
a8136c578a fixed BOM handling #344 2016-10-29 21:08:30 +02:00
Niels
b820bb3b1f fixed a lot of unicode errors (#344)
BOMs currently yield an error.
2016-10-29 19:35:17 +02:00
Niels
b03bbe724d added n test cases (#344) 2016-10-29 14:02:33 +02:00
Niels
7da182472d Merge branch 'develop' into feature/jsontestsuite 2016-10-29 13:37:17 +02:00
Niels
42ea4fb751 fixed a bug for short input files (#344)
For input files with less than 5 bytes, the parser had a bug so that
refilling the input buffer led to erasing it.
2016-10-29 13:32:36 +02:00
Niels
2fdba9de19 added "y" cases 2016-10-26 23:45:11 +02:00
Niels
a2808322c6 add test files from https://github.com/nst/JSONTestSuite 2016-10-26 18:57:56 +02:00
Niels Lohmann
a29fcae409 fixed Cmake link 2016-10-26 09:20:40 +02:00
Théo DELRIEU
b81c2a22ea fix compilation on gcc 4.9 2016-10-23 17:56:13 +02:00
Niels
3ebe28970a small fixes 2016-10-23 17:25:07 +02:00
Théo Delrieu
56492ce9c3 fix compilation on vs2015 (taken from MS-ranges) 2016-10-22 19:04:59 +02:00
Niels
79d9fdc016 user-defined string literals exploit string length (#340) 2016-10-22 18:57:58 +02:00
Théo DELRIEU
15507d1e2b move most SFINAE trickery in to/from_json_fn 2016-10-21 16:28:01 +02:00
Théo DELRIEU
5451aa5373 remove has_destructor and has_json_traits, use decltype instead 2016-10-20 18:02:07 +02:00
Théo DELRIEU
9d290c6d99 use uncvref_t<T> instead of remove_cv_t<remove_reference_t<T>>> 2016-10-20 14:06:11 +02:00
Théo DELRIEU
db4806b247 rename __static_const to _static_const (reserved identifier) 2016-10-20 13:45:48 +02:00
Théo DELRIEU
2407833226 revert useless formatting 2016-10-20 13:37:50 +02:00
Théo DELRIEU
06d60de3aa add alias templates to reduce boilerplate 2016-10-19 00:17:49 +02:00
Théo DELRIEU
733e95f4ae wip: add get_impl overload that uses free from_json method 2016-10-19 00:00:54 +02:00
Théo DELRIEU
f805dfcbbf wip: modify from_json prototype 2016-10-19 00:00:53 +02:00
Théo DELRIEU
63241db76e wip: add free function to_json/from_json support 2016-10-19 00:00:53 +02:00
Théo DELRIEU
0001032d42 anonymous namespace renamed to detail 2016-10-19 00:00:53 +02:00
Théo DELRIEU
2ee7399b6f fix compilation on gcc-6 2016-10-19 00:00:53 +02:00
Théo Delrieu
c136f67398 add first version support for user-defined types 2016-10-19 00:00:53 +02:00
Niels
e310850353 cleanup after #336 2016-10-16 23:46:24 +02:00
Niels Lohmann
8057782bb8 Merge pull request #336 from seeekr/patch-1
fix minor grammar/style issue in README.md
2016-10-16 23:40:17 +02:00
Denis Andrejew
cb2d41e3a0 fix minor grammar/style issue in README.md 2016-10-16 02:46:43 +02:00
Niels
542a48a16a Merge branch 'release/2.0.6' into develop 2016-10-15 16:48:08 +02:00
Niels
606098f45d release 2.0.6 2016-10-15 16:47:45 +02:00
Niels
d91067220f added missing overflow check for #329 2016-10-13 21:00:48 +02:00
Niels
67b9f1936d cleanup after closing #324 2016-10-12 22:05:45 +02:00