53 Commits

Author	SHA1	Message	Date
Niels Lohmann	6121fc52cf	🎨 fix indentation	2020-04-10 13:22:58 +02:00
Artöm Bakri Al-Sarmini	8db02bcc55	Fix for gcc	2020-04-08 15:53:14 +03:00
Artöm Bakri Al-Sarmini	fec0bdd93b	still fixing	2020-04-08 00:42:03 +03:00
Artöm Bakri Al-Sarmini	4ce31695f1	Fixed formatting, trying to fix msvc build error in appveyor	2020-04-08 00:26:43 +03:00
Artöm Bakri Al-Sarmini	a74a031bba	Fix build error	2020-04-02 15:47:08 +03:00
Artöm Bakri Al-Sarmini	e4d8dc02e8	Fixes #1971 (memory leak in basic_json::push_back)	2020-04-02 15:20:25 +03:00
Niels Lohmann	c5eafe74e8	🔖 set version to 3.7.3	2019-11-17 12:09:12 +01:00
Niels Lohmann	56109eacd7	🔖 set version to 3.7.2	2019-11-10 21:23:39 +01:00
Niels Lohmann	aacdc6bbe3	🔖 set version to 3.7.1	2019-11-06 18:37:26 +01:00
Niels Lohmann	48e1fe03b5	🔖 set version to 3.7.0	2019-07-28 20:20:41 +02:00
Niels Lohmann	e65cff2a8f	🔨 small cleanup	2019-04-05 23:31:04 +02:00
Niels Lohmann	f05614b240	🏗️ adding anonymous namespace	2019-04-04 08:56:36 +02:00
onqtam	5d511a6e96	fixed a bunch of warnings from the Makefile from the root of the repo	2019-03-27 00:58:53 +02:00
onqtam	2b346099df	Merge branch 'develop' of https://github.com/nlohmann/json into doctest	2019-03-24 17:21:44 +02:00
Niels Lohmann	baaa2a4d0f	🏁 trying to use constructors from std::allocator #1536	2019-03-21 14:09:29 +01:00
Niels Lohmann	efa1b9a7bb	🔖 set version to 3.6.1	2019-03-20 20:50:05 +01:00
Niels Lohmann	b37392b7ac	🔖 set version to 3.6.0	2019-03-20 00:19:07 +01:00
Viktor Kirilov	365944b0bc	Merge branch 'develop' into doctest	2019-03-18 16:59:36 +02:00
Niels Lohmann	3cd1dac653	🚨 fix MSVC warning #1502	2019-03-11 15:33:23 +01:00
Laurent Stacul	ddc9f201f4	Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)	2019-02-22 16:05:41 +00:00
onqtam	2f44ac1def	moved from Catch to doctest for unit tests	2019-01-15 22:02:16 +02:00
Niels Lohmann	78348afeb6	🔖 set version to 3.5.0	2018-12-21 23:52:29 +01:00
Niels Lohmann	7b2f8cce03	🔖 set version to 3.4.0	2018-10-30 21:30:20 +01:00
Niels Lohmann	b968faa882	🔖 set version to 3.3.0	2018-10-05 10:59:33 +02:00
Niels Lohmann	9f3857ef6f	🔖 set version to 3.2.0	2018-08-18 18:46:15 +02:00
Niels Lohmann	ed69e50ad2	📄 added SPDX-License-Identifier	2018-05-03 17:41:45 +02:00
Niels Lohmann	b5d1755dfb	🔥 removed commented-out test cases #1060	2018-04-22 15:41:42 +02:00
Niels Lohmann	afef474c0d	🔖 set version to 3.1.2	2018-03-14 21:09:27 +01:00
Niels Lohmann	938c861a09	🔖 set version to 3.1.1	2018-02-12 22:59:36 +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
Niels Lohmann	92484f0caf	🔖 set version to 3.0.1	2017-12-29 18:31:13 +01:00
Niels Lohmann	9e3c4ad11f	🔖 set version to 3.0.0	2017-12-17 08:31:18 +01:00
Niels Lohmann	8b123107c0	🔨 fixed some pedantic GCC warnings	2017-07-07 22:41:22 +02:00
Niels Lohmann	27c65b860b	🔖 version 2.1.1	2017-02-25 16:34:38 +01:00
Niels Lohmann	8cec55a271	🚧 fixed more warnings	2017-02-22 18:14:29 +01:00
Niels Lohmann	922fe693e1	⬆️ updated Catch to v1.7.0	2017-02-04 15:30:28 +01:00
Niels Lohmann	d870826811	🔖 set version to 2.1.0	2017-01-28 16:03:35 +01:00
Niels Lohmann	245a69d554	💄 ran clang-tidy	2017-01-03 21:33:23 +01:00
Niels Lohmann	8b46eb8ec0	📄 it's 2017 already	2017-01-02 09:40:00 +01:00
Niels Lohmann	60b3703c62	🔖 version bump to 2.0.10	2017-01-02 09:35:57 +01:00
Niels Lohmann	d173517212	💄 clean up	2017-01-02 09:21:26 +01:00
Daniel Cohen	ff3221a375	#394 fixed memory leak in unit-allocator, found by clang's fsanitize	2016-12-30 15:21:25 +02:00
Niels Lohmann	303e873ae8	🔖 bumped version to 2.0.9	2016-12-16 20:45:46 +01:00
Niels Lohmann	4adb8a81bf	📝 version bump	2016-12-02 18:39:35 +01:00
Niels	700977d73e	version bump	2016-11-02 20:52:15 +01:00
Niels	606098f45d	release 2.0.6	2016-10-15 16:47:45 +02:00
Niels	3d104f1d43	version bump	2016-09-14 23:06:39 +02:00
Niels	768d66560e	version bump	2016-09-11 23:36:59 +02:00
Niels	df9fd6237e	release 2.0.3	2016-08-31 21:27:23 +02:00