952 Commits

Author	SHA1	Message	Date
Niels Lohmann	70b7455a13	🔨 minor change	2017-06-19 21:50:36 +02:00
Niels Lohmann	4e6f548c0b	Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions ... add pair/tuple conversions	2017-06-19 17:31:10 +02:00
Théo DELRIEU	08d781058c	add from_json support for std::array	2017-06-19 12:03:38 +02:00
Théo DELRIEU	6e4910d5c5	add pair/tuple conversions	2017-06-19 10:16:37 +02:00
Niels Lohmann	112a6f4e53	🔨 replaced lexer's error message by const char*	2017-06-18 13:03:14 +02:00
Steffen Brem	04a1666ef2	Add parentheses around std::min so it bypasses the macro introduced by windows.h.	2017-06-17 22:01:18 +02:00
Niels Lohmann	1fbb82de89	🔨 using std::array to buffer input	2017-06-17 20:47:53 +02:00
Niels Lohmann	b27d2adcbe	✨ accept functions to check if input is valid JSON #458	2017-06-16 19:23:55 +02:00
Théo DELRIEU	c98364834f	remove std::pair support	2017-06-13 11:11:29 +02:00
Niels Lohmann	88dc7c11fa	🔨 fixed a warning	2017-06-12 19:58:44 +02:00
Niels Lohmann	ac793e957f	🔨 trying to fix #367 ... Code from https://stackoverflow.com/a/44503794/266378 which is hopefully working with MSVC.	2017-06-12 18:58:58 +02:00
HenryLee	e12c2ee6a8	Merge branch 'develop' into iterator_arithmetic	2017-06-09 20:47:42 +10:00
Niels Lohmann	52f934cbbf	Merge pull request #609 from theodelrieu/develop ... Add pair support, fix CompatibleObject conversions (fixes #600)	2017-06-07 16:38:23 +02:00
Théo DELRIEU	cea39dfaa8	fix #600 ... Instead of calling CompatibleObjectType iterator-range constructor, first convert json::value_type to CompatibleObjectType::value_type	2017-06-07 10:24:59 +02:00
HenryLee	6661ec755b	Merge branch 'develop' into iterator_arithmetic	2017-06-07 18:01:46 +10:00
HenryLee	0f065edff6	Revert a change in reverse iterator to pass the test cases	2017-06-07 18:01:01 +10:00
Théo DELRIEU	85de93ba93	add std::pair<CompatibleStringType, T> support	2017-06-06 13:56:16 +02:00
HenryLee	c98169d0d5	Revert "Change iterator category to random access" ... This reverts commit c4ab8f827e.	2017-06-05 21:59:17 +10:00
HenryLee	fb91aa81da	Merge branch 'develop' into iterator_arithmetic	2017-06-05 20:24:21 +10:00
HenryLee	2ba554e442	Merge branch 'develop' into issue550	2017-06-05 20:24:08 +10:00
Niels Lohmann	1a9d76679a	🐛 fixed the issue with GCC7 #590	2017-06-04 18:40:32 +02:00
Niels Lohmann	d19c5ced4b	🐛 skipping BOM for iterators #602 ... I totally forgot about byte order marks in this scenario.	2017-06-02 12:38:32 +02:00
HenryLee	2d5f0c0549	Redefine the converting assignment in iterator	2017-05-31 00:50:14 +10:00
HenryLee	0a51fb22ed	Fix indentation	2017-05-30 23:37:24 +10:00
HenryLee	881cd3f420	Remove the iter_impl<const basic_json> copy constructor and copy assignment	2017-05-30 20:57:22 +10:00
HenryLee	790e7ca9e9	Add struct keyword in front of internal_iterator	2017-05-30 20:27:05 +10:00
HenryLee	ce39330ff8	Add converting constructors for iterator	2017-05-30 20:23:25 +10:00
HenryLee	c4ab8f827e	Change iterator category to random access	2017-05-30 19:44:55 +10:00
HenryLee	daea213b44	Use static cast in the implementation of the operators of reverse iterator	2017-05-29 23:56:21 +10:00
HenryLee	e42db27d6d	Fix the indentation from the latest commit	2017-05-29 20:02:58 +10:00
HenryLee	3aef1a582e	Change the definition of the operator override of reverse iterator to using the result of the base class directly	2017-05-29 19:45:34 +10:00
HenryLee	adc73d6d5f	Fix the arithmetic mistakes in reverse iterator	2017-05-29 18:52:53 +10:00
HenryLee	ed62129f8e	Override n + iterator operator in the iterator	2017-05-27 13:44:14 +10:00
Niels Lohmann	c7bd01edf2	🔨 trying something #367	2017-05-22 17:06:46 +02:00
Niels Lohmann	9e507dfad5	✅ tests and fix for #367 ... operator>> now works as expected.	2017-05-21 16:36:51 +02:00
Niels Lohmann	16b63d3197	🔨 working toward #367	2017-05-20 12:44:13 +02:00
Niels Lohmann	8a35fdd8f5	🔨 overworked accept() function ... Fixed to make sure no token is "overlooked".	2017-05-20 12:24:13 +02:00
Niels Lohmann	9ddc69f3a9	🐛 adjusting fix for future versions #586	2017-05-20 10:49:06 +02:00
Niels Lohmann	99cb095e89	🐛 fix for #586 ... Also added a Travis builder with -std=c++1z	2017-05-20 10:34:49 +02:00
Niels Lohmann	0f4131d138	Merge pull request #583 from zhaohuaxishi/doxygen_error ... fix doxygen error of basic_json::get()	2017-05-15 21:09:43 +02:00
Niels Lohmann	0c3ffe12cd	⏪ reverting first/second experiment #350	2017-05-15 21:07:58 +02:00
郭荣飞	b8dff3bc16	remove the redundant @ref command	2017-05-14 07:59:07 +08:00
Niels Lohmann	723c875604	💬 replaced "backspace" with "backslash" #509	2017-05-13 19:56:38 +02:00
郭荣飞	dfa371c436	fix doxygen error of basic_json::get()	2017-05-13 23:13:04 +08:00
Niels Lohmann	9b764ee5d6	🏁 fix for #581	2017-05-13 12:27:37 +02:00
Jay Sistar	b78457b792	Making comparison operators const.	2017-05-11 13:22:47 -04:00
Jay Sistar	00d841bfda	Adding equal and not equal operators to proxys.	2017-05-11 14:51:06 +00:00
Jay Sistar	d6c78dacd8	Fixing assignement for iterator wrapper second, and adding unit test	2017-05-10 17:53:27 +00:00
Jay Sistar	6a656ed375	Adding first and second properties to iteration_proxy_internal	2017-05-10 13:20:52 +00:00
Niels Lohmann	2afbd33472	🔨 working on #367 ... Test cases succeed as expected, but the example in #367 is not fully realized yet.	2017-05-10 12:06:24 +02:00