Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b8fd864e2 
								
							 
						 
						
							
							
								
								🔥  removed deprecated constructor  #480  
							
							... 
							
							
							
							The constructor basic_json(std::istream&, const parser_callback_t) has
been deprecated since version 2.0.0. This commit removes it together
with its code example, deprecation macro, and test cases. The code now
also compiles with -W-deprecated-declarations. 
							
						 
						
							2017-03-01 17:49:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d69242c6ba 
								
							 
						 
						
							
							
								
								💄  cleanup  
							
							... 
							
							
							
							- Added comments for the serializer class.
- Added test case for resizing of the indentation string.
- Using std::none_of to check if “.0” needs to be added to
floating-point number. 
							
						 
						
							2017-02-28 19:20:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								224f99070b 
								
							 
						 
						
							
							
								
								⚡  micro-optimization of dump()  
							
							... 
							
							
							
							A lot of small changes to avoid memory allocations:
- The locale is only queried once rather than with every number
serialization.
- The indentation string is recycled between different calls.
- The string escape function avoids a copy if no escaping is necessary.
- The string escape and the space function use a complete switch case
instead of cascaded ifs.
Cachegrind measures some 15% performance improvement. 
							
						 
						
							2017-02-28 16:28:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54ef5f7b47 
								
							 
						 
						
							
							
								
								🔨  moved serialization functions to serializer class  
							
							... 
							
							
							
							The class is currently just a wrapper for an std::ostream and collects
all functions related to serialization. The next step should be
recycling of variables to avoid repetitive initialization for each
recursive dump call. 
							
						 
						
							2017-02-27 21:22:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf4d744d1a 
								
							 
						 
						
							
							
								
								✅  more tests for meta() call  
							
							
							
						 
						
							2017-02-26 14:34:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1b30250d6 
								
							 
						 
						
							
							
								
								✅  added missing tests  
							
							
							
						 
						
							2017-02-26 11:50:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27c65b860b 
								
							 
						 
						
							
							
								
								🔖  version 2.1.1  
							
							
							
						 
						
							2017-02-25 16:34:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a646c9c599 
								
							 
						 
						
							
							
								
								🔀  merge branch 'cotire' of  https://github.com/tusharpm/json  into tusharpm-cotire  
							
							
							
						 
						
							2017-02-22 19:45:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8cec55a271 
								
							 
						 
						
							
							
								
								🚧  fixed more warnings  
							
							
							
						 
						
							2017-02-22 18:14:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d14f167b8 
								
							 
						 
						
							
							
								
								🚑  fix for  #465  
							
							
							
						 
						
							2017-02-20 22:48:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a6d7f5bca 
								
							 
						 
						
							
							
								
								🚧  try to fix some warnings in MSVC  
							
							
							
						 
						
							2017-02-20 18:32:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83f1d2c81b 
								
							 
						 
						
							
							
								
								✨  added start index for from_cbor and from_msgpack ( #462 )  
							
							
							
						 
						
							2017-02-19 21:17:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4151f2d297 
								
							 
						 
						
							
							
								
								✅  added test with thousands_sep  
							
							
							
						 
						
							2017-02-19 20:08:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tushar Maheshwari 
								
							 
						 
						
							
							
							
							
								
							
							
								85ce4d7b53 
								
							 
						 
						
							
							
								
								⚡  cmake compile time reduce using cotire  
							
							... 
							
							
							
							- Add prefix header
  - Include catch.hpp
  - Include json.hpp
    - Replace private with public for all json_unit files
- Move `unit.cpp` to an object library
- cotire issue: strip whitespace from CMAKE_INCLUDE_SYSTEM_FLAG_CXX 
							
						 
						
							2017-02-19 13:35:54 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								513eb3ab5f 
								
							 
						 
						
							
							
								
								🚧  clean up  
							
							
							
						 
						
							2017-02-18 11:00:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6408402ad2 
								
							 
						 
						
							
							
								
								🔀  merge  #378  (for  #362  and  #454 )  
							
							
							
						 
						
							2017-02-16 09:24:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								057b1e606b 
								
							 
						 
						
							
							
								
								🔀  merged  #415  (fix for  #414 )  
							
							
							
						 
						
							2017-02-16 08:50:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9f3149451 
								
							 
						 
						
							
							
								
								🚑  fix for  #452  
							
							
							
						 
						
							2017-02-15 21:30:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai STAN 
								
							 
						 
						
							
							
							
							
								
							
							
								6bf93b3d06 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							
							
						 
						
							2017-02-15 15:00:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								22b9a301d6 
								
							 
						 
						
							
							
								
								Merge pull request  #450  from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num  
							
							... 
							
							
							
							TurpentineDistillery feature/locale independent str to num 
							
						 
						
							2017-02-14 07:18:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c95ff863bf 
								
							 
						 
						
							
							
								
								⬆️  updated Catch to v1.7.2  
							
							
							
						 
						
							2017-02-13 18:55:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								265c5b5207 
								
							 
						 
						
							
							
								
								🔨  more work on the number parser  
							
							
							
						 
						
							2017-02-13 18:51:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b84705d557 
								
							 
						 
						
							
							
								
								✅  improved test coverage  
							
							
							
						 
						
							2017-02-12 20:14:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c8191c8172 
								
							 
						 
						
							
							
								
								🔨  further cleanup  
							
							
							
						 
						
							2017-02-12 18:50:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2d55109c1 
								
							 
						 
						
							
							
								
								🔨  make lexer distinguishes number types  
							
							
							
						 
						
							2017-02-11 16:54:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								8d88a1da2a 
								
							 
						 
						
							
							
								
								🔀  merged  #379  and fixed conflicts  
							
							
							
						 
						
							2017-02-05 13:13:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								d284c86dd1 
								
							 
						 
						
							
							
								
								✅  uncommented some tests  
							
							
							
						 
						
							2017-02-04 21:00:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								922fe693e1 
								
							 
						 
						
							
							
								
								⬆️  updated Catch to v1.7.0  
							
							
							
						 
						
							2017-02-04 15:30:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								1cfdc2a753 
								
							 
						 
						
							
							
								
								🐛  fixed test compilation  
							
							
							
						 
						
							2017-02-04 08:25:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								5976caf032 
								
							 
						 
						
							
							
								
								⚡  improved test compilation speed  #445  
							
							
							
						 
						
							2017-02-03 18:09:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								16af771277 
								
							 
						 
						
							
							
								
								✅  added roundtrip test for the Big List of Naughty Strings  
							
							
							
						 
						
							2017-02-01 17:34:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								0164b10e10 
								
							 
						 
						
							
							
								
								✅  added missing tests found by mutate++  
							
							
							
						 
						
							2017-01-29 17:18:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								d870826811 
								
							 
						 
						
							
							
								
								🔖  set version to 2.1.0  
							
							
							
						 
						
							2017-01-28 16:03:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai STAN 
								
							 
						 
						
							
							
							
							
								
							
							
								6198439f59 
								
							 
						 
						
							
							
								
								fix   #414  - comparing to 0 literal  
							
							... 
							
							
							
							Overload comparison operators for all types that could be converted
to nullptr. 
							
						 
						
							2017-01-24 22:33:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								030cf674ef 
								
							 
						 
						
							
							
								
								🚧  fixed a warning  
							
							
							
						 
						
							2017-01-24 12:49:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Niels Lohmann 
								
							 
						 
						
							
							
							
							
								
							
							
								3857e55290 
								
							 
						 
						
							
							
								
								💄  ran "make pretty"  
							
							
							
						 
						
							2017-01-24 12:43:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								9f103d19d7 
								
							 
						 
						
							
							
								
								add implicit conversions test (operator T())  
							
							
							
						 
						
							2017-01-22 14:23:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								9f8b270ed9 
								
							 
						 
						
							
							
								
								fix some warnings  
							
							
							
						 
						
							2017-01-22 14:07:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								7f359017d2 
								
							 
						 
						
							
							
								
								rename template argument Json -> BasicJsonType  
							
							
							
						 
						
							2017-01-21 19:12:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								708eb9613b 
								
							 
						 
						
							
							
								
								disable reserve tests when exceptions are disabled  
							
							
							
						 
						
							2017-01-21 19:12:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								3e15b551e0 
								
							 
						 
						
							
							
								
								run make pretty  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								b56117b148 
								
							 
						 
						
							
							
								
								add noexcept tests  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								07bc82d3a7 
								
							 
						 
						
							
							
								
								put const to the left  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								f1482d1f01 
								
							 
						 
						
							
							
								
								more tests in unit-udt  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								b8012876a5 
								
							 
						 
						
							
							
								
								add noexcept checks, and some missing noexcepts  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								1554baa01d 
								
							 
						 
						
							
							
								
								attempting to fix coverage. testing that reserve is called  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								3494014ba0 
								
							 
						 
						
							
							
								
								new unit-udt.cpp tests  
							
							
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								be6b417c87 
								
							 
						 
						
							
							
								
								tweak SFINAE checks for internal types (see commit body)  
							
							... 
							
							
							
							only check for public types (iterators, json_pointer)
for private ones (m_array.iterator, primitive_iterator) simply double
parentheses on relevant Catch checks 
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								c847e0eea2 
								
							 
						 
						
							
							
								
								replace constructor by from/to_json: array_t  
							
							... 
							
							
							
							- tweaked a bit how `get<container<json>>` is handled
- added a from_json overload for forward list 
							
						 
						
							2017-01-21 16:14:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Théo DELRIEU 
								
							 
						 
						
							
							
							
							
								
							
							
								6d427acdde 
								
							 
						 
						
							
							
								
								replace constructor by from/to_json: unscoped enum types  
							
							... 
							
							
							
							this also means that one can do: j.get<unscoped_enum>(); 
							
						 
						
							2017-01-21 16:14:22 +01:00