| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3d4f6a2940 | 🔨 cleaner exception interface | 2018-03-11 22:47:25 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ad47b0fbde | ♻️ refactored binary readers to use a SAX parser | 2018-03-11 18:47:38 +01:00 |  | 
				
					
						| 
								
								
									 Vitaliy Manushkin | 392c033805 | test refactoring | 2018-03-11 00:29:04 +03:00 |  | 
				
					
						| 
								
								
									 Vitaliy Manushkin | 51349537fc | add unit test: checking dump to alternative string type | 2018-03-10 23:59:10 +03:00 |  | 
				
					
						| 
								
								
									 Vitaliy Manushkin | 830f3e5290 | forward alternative string class from output_adapter to output_string_adapter | 2018-03-10 23:58:16 +03:00 |  | 
				
					
						| 
								
								
									 Vitaliy Manushkin | ed6b1464f9 | dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code) | 2018-03-10 17:36:51 +03: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 | 149d2fd09c | 💚 improved test coverage | 2018-03-10 11:24:00 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6399cd3039 | Merge branch 'develop' into feature/sax2 | 2018-03-10 11:07:36 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6151dfaed7 | 👌 made changes proposed in #1001 | 2018-03-10 11:02:58 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 35e43df625 | Merge branch 'develop' into feature/sax2 | 2018-03-09 21:56:30 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9918523077 | 📝 cleanup after #1001 | 2018-03-09 21:31:46 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e737de8941 | Merge pull request #1001 from nlohmann/leak Fix memory leak during parser callback | 2018-03-09 21:23:00 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | aa8fc2a41c | 🚑 hopefully fixed the memory leak | 2018-03-08 17:11:15 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7c1a788893 | Merge branch 'develop' into feature/sax2 | 2018-03-08 07:39:37 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | cf60e18c89 | 🔥 removing failing test (work on this in branch "leak") | 2018-03-08 07:39:21 +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 | 38345fd06c | 👌 fixed some more warnings | 2018-03-07 22:51:22 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 8b379948d0 | 🔥 replaced acceptor with SAX parser | 2018-03-07 22:40:48 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 303a0c5843 | Merge branch 'develop' into feature/sax2 | 2018-03-07 22:26:01 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d183d34b96 | 💚 added another test case | 2018-03-07 22:25:25 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d2d65bb25b | ♻️ refined SFINAE to fix some warnings | 2018-03-07 22:01:44 +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 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5beab80553 | 🔨 using the SAX-DOM parser | 2018-03-06 18:17:07 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | faf2546a15 | 🔨 simplified SAX-DOM parser | 2018-03-06 07:19:05 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5b9d03cfdb | 🔨 added SAX-DOM-Parser | 2018-03-05 21:06:00 +01:00 |  |