14 commits

Author	SHA1	Message	Date
Niels Lohmann	ed69e50ad2	📄 added SPDX-License-Identifier	2018-05-03 17:41:45 +02:00
Jan Schöppach	53fb230098	Fix typo	2018-04-17 12:08:44 +02:00
Niels Lohmann	afef474c0d	🔖 set version to 3.1.2	2018-03-14 21:09:27 +01:00
Vitaliy Manushkin	faccc37d0d	dump to alternate implementation of string, as defined in basic_json template	2018-03-10 17:19:28 +03:00
Niels Lohmann	6151dfaed7	👌 made changes proposed in #1001	2018-03-10 11:02:58 +01:00
Niels Lohmann	97559bb1b2	🔨 trying to fix the leak ... Part 1: properly use forwarding	2018-03-08 07:36:56 +01:00
Niels Lohmann	476b2e09be	💚 added regression tests for #972 and #977	2018-03-06 20:13:31 +01:00
Niels Lohmann	62030615a0	Merge pull request #986 from theodelrieu/fix/basic_json_conversion ... Fix/basic json conversion	2018-03-06 19:27:39 +01:00
Mike Bogdanov	2a2ed799b1	pvs_studio fix. misprinted condition	2018-03-02 11:12:44 +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	938c861a09	🔖 set version to 3.1.1	2018-02-12 22:59:36 +01:00
Niels Lohmann	865ff00de0	📝 updated documentation wrt. objects #963	2018-02-09 23:37:20 +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

Renamed from develop/json.hpp (Browse further)