939 Commits

Author	SHA1	Message	Date
Niels Lohmann	7fa4ddf93e	💄 fixed indentation	2018-06-23 17:27:40 +02:00
Niels Lohmann	bf348ca8a4	Merge pull request #1028 from gracicot/develop ... Added support for string_view in C++17	2018-06-23 17:10:04 +02:00
Niels Lohmann	850922269d	🚨 removed compiler warnings	2018-06-23 10:28:04 +02:00
Niels Lohmann	e7c1638d11	💄 cleanup	2018-06-18 22:03:46 +02:00
Niels Lohmann	1c81e9f5ae	Merge pull request #1130 from agrianius/develop ... test (non)equality for alt_string implementation	2018-06-18 22:01:53 +02:00
Théo DELRIEU	2c920a1032	run make amalgamate	2018-06-18 15:14:10 +02:00
Théo DELRIEU	2b37d7ed86	from_json: add overload for std::unordered_map ... Fixes #1133	2018-06-18 15:14:10 +02:00
Vitaliy	f574d7e084	simplify templates for operators, add more checks	2018-06-14 15:07:06 +03:00
Vitaliy	cd28d872e7	forward declarations to make new compilers happy	2018-06-11 20:50:39 +03:00
Vitaliy	3d3055909c	define global operator< for const char* and alt_string	2018-06-11 19:09:57 +03:00
Vitaliy	4feb8211ca	test (non)equality for alt_string implementation	2018-06-11 18:03:46 +03:00
Guillaume Racicot	714c592680	Disabled implicit conversion to string_view on MSVC 15.13 and older	2018-06-01 14:22:57 -04:00
Niels Lohmann	e5a67fc3f8	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2018-05-28 17:57:46 +02:00
Niels Lohmann	a49644ab74	🚑 adjusted Fuzzer to new parser ... out_of_range exceptions where unexpected before - the parser used to crash in these situations...	2018-05-28 17:57:22 +02:00
Niels Lohmann	0efaf891e5	Merge pull request #1089 from theodelrieu/feature/map_conversion ... Provide a from_json overload for std::map	2018-05-28 14:53:23 +02:00
Théo DELRIEU	c5e63fd684	Provide a from_json overload for std::map ... This overload is chosen only when BasicJsonType::string_t is not constructible from std::map::key_type. Currently, converting a map to json treats it as an array of pairs. fixes #1079	2018-05-28 11:06:24 +02:00
Niels Lohmann	1f84cc2c88	✅ adjusted test cases	2018-05-17 16:50:37 +02:00
Niels Lohmann	717301d1bc	Merge branch 'testsuite' into feature/sax2	2018-05-17 16:36:43 +02:00
Niels Lohmann	4639bb2c8f	✅ added more tests from recent nst's JSONTestSuite	2018-05-17 10:10:01 +02:00
Niels Lohmann	5ff2abb90d	Merge branch 'develop' into feature/sax2	2018-05-06 13:29:23 +02:00
Niels Lohmann	ed69e50ad2	📄 added SPDX-License-Identifier	2018-05-03 17:41:45 +02:00
Niels Lohmann	fa3e42f826	Merge branch 'develop' into feature/wstring	2018-04-29 13:16:12 +02:00
Niels Lohmann	b5d1755dfb	🔥 removed commented-out test cases #1060	2018-04-22 15:41:42 +02:00
Guillaume Racicot	aaee18ce90	Added test for string conversion with string_view	2018-04-09 11:15:33 -04:00
Niels Lohmann	cf91b4f2bb	Merge branch 'develop' into feature/wstring	2018-04-08 11:36:58 +02:00
Niels Lohmann	e1ea8369ad	Merge branch 'develop' into feature/sax2	2018-04-08 09:31:59 +02:00
Niels Lohmann	18a0271a95	Merge branch 'develop' into feature/issue1021	2018-04-08 09:21:43 +02:00
Niels Lohmann	495436a5d5	Merge pull request #1026 from ktonon/develop ... Added public target_compile_features for auto and constexpr	2018-04-03 17:34:42 +02:00
Niels Lohmann	aa89c5e048	🔨 removing unget_character() function from input adapters #834	2018-04-02 21:10:48 +02:00
Niels Lohmann	6678eb2b4a	✅ improved test coverage #1031	2018-04-02 15:38:49 +02:00
Niels Lohmann	727dd4664b	🔨 trying to make tests run with MSVC #1031	2018-04-02 12:27:07 +02:00
Niels Lohmann	ab89ae4e50	🔨 trying to make tests run with MSVC #1031	2018-04-02 11:34:36 +02:00
Niels Lohmann	eb06d0531a	🚧 added input adapter for wide strings #1031	2018-04-01 19:12:36 +02:00
Niels Lohmann	4efa8cdb4c	💚 fixed Valgrind options #1030	2018-03-29 17:19:21 +02:00
Guillaume Racicot	c78dbc366c	Added test for conversion to string_view	2018-03-29 01:03:57 -04:00
Niels Lohmann	5f723bbec6	🔨 realized callback parser wirh SAX interface #971	2018-03-28 23:39:39 +02:00
Niels Lohmann	896a9db461	🔨 improved code #1021	2018-03-28 19:37:21 +02:00
Kevin Tonon	73cc5089e3	Using target_compile_features to specify C++ 11 standard	2018-03-28 13:11:49 -04:00
Niels Lohmann	a9baab76c2	🚑 fix for #1021	2018-03-28 18:20:55 +02:00
Niels Lohmann	4f6b2b6429	🔨 changed SAX interface	2018-03-21 20:12:06 +01:00
Niels Lohmann	2537677e4c	✅ improved test coverage	2018-03-20 23:40:01 +01:00
Niels Lohmann	9e1abb4842	✅ improved coverage	2018-03-20 22:39:08 +01:00
Niels Lohmann	1e38ffc014	✅ more tests	2018-03-20 20:04:11 +01:00
Niels Lohmann	99ecca55c4	✅ improved test coverage	2018-03-20 18:49:10 +01:00
Niels Lohmann	9e07e9b4ec	✨ implemented non-throwing binary reader	2018-03-19 22:48:13 +01:00
Niels Lohmann	606a25195f	✅ improved test coverage	2018-03-17 19:15:59 +01:00
Niels Lohmann	27cf05af8d	Merge branch 'develop' into feature/sax2	2018-03-14 22:02:19 +01:00
Niels Lohmann	afef474c0d	🔖 set version to 3.1.2	2018-03-14 21:09:27 +01:00
Niels Lohmann	a52e8355b8	⏪ oops	2018-03-14 17:32:48 +01:00
Niels Lohmann	21410d50af	🏁 moved /Wall to CMake	2018-03-14 17:21:31 +01:00