1670 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	b49ce351eb	💄 fixed some warnings	2017-02-22 20:48:29 +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	345a106d73	💄 cleanup	2017-02-22 16:56:56 +01:00
Niels Lohmann	967f9144d4	🚧 overworked fix for #465	2017-02-21 19:11:34 +01:00
Niels Lohmann	7d14f167b8	🚑 fix for #465	2017-02-20 22:48:27 +01:00
Niels Lohmann	b04543ecc5	🎨 fixed newlines	2017-02-20 21:56:10 +01:00
Niels Lohmann	1a6d7f5bca	🚧 try to fix some warnings in MSVC	2017-02-20 18:32:11 +01:00
Niels Lohmann	f7075be93a	🐛 reverted change for #464	2017-02-20 18:15:50 +01:00
Niels Lohmann	f2dfa09aec	🐛 fix for #464	2017-02-20 18:05:52 +01:00
Niels Lohmann	83a9c60dbd	🔨 refactored code to avoid using strcpy/strlen/strcat (#463)	2017-02-20 17:37:34 +01:00
Niels Lohmann	716485a965	🚧 removed decay (#448)	2017-02-20 16:27:16 +01:00
Niels Lohmann	7a4a16a7db	💄 updated header list	2017-02-20 16:20:45 +01:00
Niels Lohmann	1f72c38861	🚑 fix for #448	2017-02-19 21:26:53 +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
Niels Lohmann	5b53f03e7c	Merge branch 'develop' into TurpentineDistillery-feature/locale_independent_num_to_str	2017-02-19 19:24:55 +01:00
Niels Lohmann	9a9d0ba3df	🚧 fixing warning C4293 (#453)	2017-02-19 17:47:20 +01:00
Tushar Maheshwari	5436407b7e	👷 Add cmake logic to Travis config ... - get CMake for XCode 8.1 image	2017-02-19 13:38:08 +05:30
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	d1479e47bb	💄 added assertion message	2017-02-18 11:01:03 +01:00
Niels Lohmann	513eb3ab5f	🚧 clean up	2017-02-18 11:00:18 +01:00
Niels Lohmann	0200f2dc62	🚧 fixing warning C4267 (#453)	2017-02-17 19:14:21 +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	2c17c1b1b2	💄 cleanup	2017-02-16 08:01:01 +01:00
Niels Lohmann	973402c11e	🚧 replaced throws (#440) and _MAX/_MIN macros (#451)	2017-02-15 22:44:18 +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	82fb613763	📝 update after #302	2017-02-14 07:28:30 +01: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	9f5dccbab5	💄 cleanup	2017-02-11 15:55:53 +01:00
Niels Lohmann	926af6d50b	🔀 merge branch 'develop' into TurpentineDistillery-feature/locale_independent_str_to_num	2017-02-11 15:17:47 +01:00
Niels Lohmann	ed8516dc39	👷 added Codacy badge	2017-02-09 17:38:02 +01:00
Niels Lohmann	c485d46cea	📝 screenshoots look ugly	2017-02-08 20:00:46 +01:00
Niels Lohmann	6fd77cea4a	📝 added screenshots	2017-02-08 19:22:19 +01:00
Niels Lohmann	0ffa18aab8	📝 listing projects using the library	2017-02-08 19:16:38 +01:00
Niels Lohmann	662a9b8f3c	✏️ fixed more typos	2017-02-08 18:19:41 +01:00
Niels Lohmann	4746a4c536	💄 minor change	2017-02-08 17:56:43 +01:00
Niels Lohmann	163f8397fd	✏️ fixed a typo #446	2017-02-05 17:11:26 +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	77d6f70602	📝 acknowledgments for #442 and #445	2017-02-03 18:28:22 +01:00