764 Commits (c35d260c2fb91b8a53e585d480607a0f088cbbbb)

Author	SHA1	Message	Date
Mike Bogdanov	fd30ad8a14	did make amalgamate	2018-03-02 11:47:35 +03:00
Théo DELRIEU	8711ec6034	support construction from other basic_json types ... Before this patch, `basic_json` types with different template arguments were treated as `CompatibleArrayType`. Which sometimes leads to recursive calls and stack overflows. This patch adds a constructor and a `get` overload to deal with different `basic_json` types.	2018-02-27 16:48:09 +01:00
Niels Lohmann	3ff9455332	🔨 added a SAX-DOM-Parser	2018-02-26 23:39:23 +01:00
Niels Lohmann	21352c4d8e	♻️ refactored SAX parser	2018-02-26 20:08:12 +01:00
Niels Lohmann	8d6b3d44d6	👌 fixed some compiler warnings	2018-02-25 18:35:16 +01:00
Niels Lohmann	8c7f46f7d0	🔨 removed a logic error and improved coverage	2018-02-25 17:10:30 +01:00
Niels Lohmann	374ebacc51	✨ added a SAX parser #971	2018-02-24 18:04:07 +01:00
Niels Lohmann	938c861a09	🔖 set version to 3.1.1	2018-02-12 22:59:36 +01:00
Théo DELRIEU	01d6118828	Fix constraints on from_json(CompatibleArrayType) ... Fixes #924	2018-02-12 15:37:33 +01:00
Niels Lohmann	865ff00de0	📝 updated documentation wrt. objects #963	2018-02-09 23:37:20 +01:00
Niels Lohmann	33a9b00ce6	🐛 fix for #962 ... Added out_of_range exception for UBJSON containers with sizes that exceed the target container's max_size.	2018-02-06 22:38:53 +01:00
Niels Lohmann	8b457ace25	🐛 fixing CBOR's indefinity length strings #961 ... Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...	2018-02-06 20:43:03 +01:00
Niels Lohmann	0258484626	🔖 set version to 3.1.0 ... - updated documentation wrt. new repository layout - temporarily switched off Homebrew --HEAD building (can only be switched on after release) - set copyright date to 2018	2018-02-01 22:20:26 +01:00
Théo DELRIEU	14cd019861	fix cmake install directory (for real this time) ... * Rename 'develop' folder to 'include/nlohmann' * Rename 'src' folder to 'single_include/nlohmann' * Use <nlohmann/*> headers in sources and tests * Change amalgamate config file	2018-02-01 11:06:51 +01:00