Commit Graph

1204 Commits

Author SHA1 Message Date
Théo DELRIEU
c41e03be6b remove constraints on JSONSerializer instances, constrain correctly new methods 2016-11-26 01:46:02 +01:00
Théo DELRIEU
b1e47170c4 add is_compatible_* traits 2016-11-26 01:46:02 +01:00
Théo DELRIEU
a5d81ff3c2 add basic test for custom serializer 2016-11-26 01:46:02 +01:00
Théo DELRIEU
88f7eb63d9 fix compilation: add a return in constexpr functions 2016-11-26 01:46:02 +01:00
Théo DELRIEU
75a9cf116e to_json and from_json takes both two arguments now
the first is the basic_json type, the second the user-defined type
2016-11-26 01:46:02 +01:00
Théo DELRIEU
7dbafbe4ba renamed unit-constructor3.cpp to unit-udt.cpp 2016-11-26 01:46:02 +01:00
Théo DELRIEU
d45533b32f add template arguments for JSONSerializer 2016-11-26 01:46:02 +01:00
Théo DELRIEU
7d6dbcfbf4 add first version for alternate implementation 2016-11-26 01:46:02 +01:00
Théo DELRIEU
0ec64b6df4 fix compilation on gcc 4.9 2016-11-26 01:46:01 +01:00
Théo Delrieu
e90553f863 fix compilation on vs2015 (taken from MS-ranges) 2016-11-26 01:46:01 +01:00
Théo DELRIEU
d36ae188e1 move most SFINAE trickery in to/from_json_fn 2016-11-26 01:46:01 +01:00
Théo DELRIEU
93dabed0a8 remove has_destructor and has_json_traits, use decltype instead 2016-11-26 01:46:01 +01:00
Théo DELRIEU
27d4416a09 use uncvref_t<T> instead of remove_cv_t<remove_reference_t<T>>> 2016-11-26 01:46:01 +01:00
Théo DELRIEU
34c9f092a2 rename __static_const to _static_const (reserved identifier) 2016-11-26 01:46:01 +01:00
Théo DELRIEU
d2f8d439f9 revert useless formatting 2016-11-26 01:46:01 +01:00
Théo DELRIEU
eb58a4e51c add alias templates to reduce boilerplate 2016-11-26 01:46:01 +01:00
Théo DELRIEU
3bbccb1544 wip: add get_impl overload that uses free from_json method 2016-11-26 01:46:01 +01:00
Théo DELRIEU
2bb49e1555 wip: modify from_json prototype 2016-11-26 01:46:01 +01:00
Théo DELRIEU
d6fea62a29 wip: add free function to_json/from_json support 2016-11-26 01:46:01 +01:00
Théo DELRIEU
528315fb03 anonymous namespace renamed to detail 2016-11-26 01:46:00 +01:00
Théo DELRIEU
8da5ad5acb fix compilation on gcc-6 2016-11-26 01:45:31 +01:00
Théo Delrieu
ca811a28ee add first version support for user-defined types 2016-11-26 01:45:31 +01:00
Niels Lohmann
a791af30b4 Merge branch 'feature/filenotfound' into develop 2016-11-25 17:39:38 +01:00
Niels Lohmann
1ed510c232 Merge branch 'develop' into feature/filenotfound 2016-11-25 17:39:24 +01:00
Niels Lohmann
f194db9aa6 added assertion for warning from #368 2016-11-24 22:07:35 +01:00
Niels Lohmann
c39c36e6ad 💄 fixed indentation 2016-11-24 22:05:29 +01:00
Niels Lohmann
472d0045ba 📝 updating README after fixing #299 2016-11-24 21:56:21 +01:00
Niels Lohmann
1407bbf94c 💄 fixed indentation 2016-11-24 21:54:05 +01:00
Niels Lohmann
8014637ad1 added a test for EOF error (#367) 2016-11-24 21:53:41 +01:00
Niels Lohmann
dfc49e7afe 🐛 fixed a bug if parser was called with a stream at EOF (#367) 2016-11-24 21:45:10 +01:00
Niels Lohmann
e3450cac72 📈 removing more variance of the benchmarks 2016-11-24 18:24:26 +01:00
Niels Lohmann
c3a610d32a 🔧 ignoring Clion files 2016-11-24 17:45:01 +01:00
Niels Lohmann
25548f85c9 👷 trying Coverity with Clang 3.6 (#299) 2016-11-24 17:25:05 +01:00
Niels Lohmann
4bb41d065b 🐛 parsing erroneous files yields an exception (#366) 2016-11-23 16:57:01 +01:00
Niels
ed611119d9 📈 reducing benchmark variance (#365) 2016-11-23 08:47:40 +01:00
Niels
c34b41acd6 🐛 fixes crash in dump from static object (#359)
Merge branch 'feature/issue359' into develop
2016-11-22 06:57:58 +01:00
Niels
abce5c25bb 📝 cleaned comments and updated README 2016-11-21 23:38:17 +01:00
Niels
43dbe02d5b 🐛 fixing #359 2016-11-21 21:53:10 +01: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