4022 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Axel Huebl	e439a1a9a7	CMake: 3.8+ is Sufficient ... The current CMake scripts depend on CMake 3.8+. This allows us to remove previous work-arounds.	2018-04-07 13:15:44 +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
Kevin Tonon	a35d414c39	Update CMake to latest on Travis	2018-04-03 08:28:07 -04:00
Niels Lohmann	08a7233d1b	🚑 fixed commit 1e08654	2018-04-02 22:38:44 +02:00
Niels Lohmann	1e08654f99	🔨 cleanup	2018-04-02 22:25:17 +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	16c5bfeaad	👌 fixed compiler warnings #1031	2018-04-02 13:01:56 +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	ba6edd5634	🔨 cleanup	2018-03-30 00:38:18 +02:00
Niels Lohmann	850671b9f1	🔨 using a vector<bool> for the parser hierarchy	2018-03-29 18:45:43 +02:00
Niels Lohmann	4efa8cdb4c	💚 fixed Valgrind options #1030	2018-03-29 17:19:21 +02:00
Niels Lohmann	830c93fd09	📝 fixed example for operator> #1029	2018-03-29 17:07:55 +02:00
Guillaume Racicot	c78dbc366c	Added test for conversion to string_view	2018-03-29 01:03:57 -04:00
Guillaume Racicot	53d8d57921	Amalgamate single include	2018-03-29 01:03:36 -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	25f56ff207	📝 updated documentation	2018-03-20 19:22:18 +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	a271ee5f16	♻️ proper use of SAX parser for binary formats	2018-03-18 23:00:45 +01:00
Niels Lohmann	943d641054	🔨 some refactoring	2018-03-18 16:07:21 +01:00
Niels Lohmann	22929fe189	🚧 started a SAX/DOM/callback parser	2018-03-18 15:13:53 +01:00
Niels Lohmann	375b05a17d	🔨 cleanup	2018-03-17 23:31:18 +01:00
Niels Lohmann	606a25195f	✅ improved test coverage	2018-03-17 19:15:59 +01:00
Niels Lohmann	c87ffad45c	♻️ implemented a non-recursive parser	2018-03-17 14:46:50 +01:00
Guillaume Racicot	2a5506ed98	Amalgamated headers	2018-03-16 13:16:10 -04:00
Guillaume Racicot	8165707990	basic_json now supports getting many type of strings	2018-03-15 15:35:00 -04:00
Niels Lohmann	27cf05af8d	Merge branch 'develop' into feature/sax2	2018-03-14 22:02:19 +01:00
Niels Lohmann	d2dd27dc3b	Merge branch 'release/3.1.2' into develop	2018-03-14 21:48:03 +01:00
Niels Lohmann	8a6c8cb0f7	🔖 set version to 3.1.2	2018-03-14 21:32:03 +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
Niels Lohmann	829ed74d66	🏁 experimenting with /Wall	2018-03-14 07:38:22 +01:00
Niels Lohmann	1262d474eb	🏁 fixed an MSVC warning	2018-03-14 07:32:28 +01:00
Niels Lohmann	282bafae4f	🔨 fixed compilation error	2018-03-14 07:18:42 +01:00
Niels Lohmann	abac6a0e84	Merge branch 'develop' into feature/sax2	2018-03-13 23:58:17 +01:00
Niels Lohmann	919d1fef8f	Merge pull request #1009 from nlohmann/user_string_parser ... Allowing for user-defined string type in lexer/parser	2018-03-13 14:52:59 +01:00
Niels Lohmann	8557151d90	♻️ adjusting lexer/parser in symmetry to #1006	2018-03-12 19:15:11 +01:00
Niels Lohmann	b56ac86471	📝 thanks for #1006	2018-03-12 18:44:19 +01:00
Niels Lohmann	0cab3b2c8e	Merge pull request #1006 from agrianius/dump-template ... dump to alternative string type, as defined in basic_json template	2018-03-12 18:41:59 +01:00