haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
898 commits 11 branches 56 tags 222 MiB
Commit graph

898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Trevor Welsby a4a88b1b7d Issue #195 - update Travis to Trusty due to gcc/clang strtod() bug 2016-01-26 08:36:18 +10:00
Niels 2b13711009 updated online version 2016-01-24 23:02:28 +01:00
Niels c09d03fba7 fixed documentation 2016-01-24 22:43:00 +01:00
Niels 31093694ce fixed version number 2016-01-24 22:21:27 +01:00
Niels aee99b362d some editing 2016-01-24 19:24:06 +01:00
Trevor Welsby 0f28c69499 Merge upstream commits and resolve conflicts 2016-01-25 02:48:38 +10:00
Trevor Welsby 281492c581 Merge upstream commits and resolve conflicts 2016-01-25 02:42:20 +10:00
Niels 54a4139157 cleanup after #191 2016-01-24 17:33:46 +01:00
Trevor Welsby 4620960b72 Disable problematic test for GCC/clang, remove debug dump from unit.cpp 2016-01-25 02:22:46 +10:00
Niels ad5d1dabb2 Merge pull request #191 from twelsby/issue186 
Fixed Issue #186 - add strto(f|d|ld) overload wrappers, "-0.0" special case and FP trailing zero
 2016-01-24 17:21:22 +01:00
Trevor Welsby 81b7079255 Kill unused argument warnings in GCC/clang 2016-01-25 02:13:39 +10:00
Trevor Welsby 19918b948d Fix typo in preprocessor defined/!defined 2016-01-25 02:07:49 +10:00
Niels 9584a99a43 added issue stats 2016-01-24 17:06:36 +01:00
Trevor Welsby 421affd06e Merge upstream commits and resolve conflicts 2016-01-25 02:01:01 +10:00
Trevor Welsby 4d6985d4e2 Disable problematic test for GCC/clang, remove debug dump from unit.cpp 2016-01-25 01:53:32 +10:00
Niels dfb01c659b added more comments 2016-01-24 16:42:45 +01:00
Niels 3245a0dc06 fixed #194 2016-01-24 16:42:13 +01:00
Trevor Welsby 12ef668335 Merge upstream commits and resolve conflicts 2016-01-25 01:15:13 +10:00
Trevor Welsby d7ef2ccffd Issue #178 - fully support int64_t/uint64_t numbers, add unsigned type 2016-01-25 01:04:37 +10:00
Niels 8b6e0dc02d small addition 2016-01-24 13:28:16 +01:00
Niels d7d1e55648 applied include-what-you-use 2016-01-24 13:28:08 +01:00
Niels 8a0490a011 cleanup 2016-01-24 13:04:55 +01:00
Niels e00b00fea8 Merge pull request #190 from twelsby/issue185 
fixed #185 - remove approx() and use #pragma to kill warnings
 2016-01-24 12:55:40 +01:00
Niels 600ad330c5 cleanup after PR #189 2016-01-24 11:00:54 +01:00
Niels 21a44da89d Merge pull request #189 from twelsby/issue171 
Fixed Issue #171 - added two extra template overloads of operator[] for T* arguments
 2016-01-24 10:47:26 +01:00
Trevor Welsby f79d52b973 DEBUG ONLY: DUMP INFO FROM TRAVIS 2016-01-24 19:15:30 +10:00
Trevor Welsby c1f5f0451d Add workaround for gcc < 5 not supporting std::defaultfloat 2016-01-24 17:54:50 +10:00
Trevor Welsby bd8db5d40e Remove VS induced tabs 2016-01-24 17:15:44 +10:00
Trevor Welsby a1c6f16bd3 Fix Issue #186 - add overload wrappers for strto(f|d|ld) 2016-01-24 17:00:11 +10:00
Trevor Welsby 3a1403409f Issue #185 - remove approx() and use #pragma to kill warnings 2016-01-23 17:45:30 +10:00
Trevor Welsby bd0f3001c6 Fix typo in new unit.hpp comments 2016-01-23 17:31:58 +10:00
Trevor Welsby 7e3245786c Fixed issue #171 - added extra operator[] template overloads 2016-01-23 17:03:45 +10:00
Trevor Welsby 9de14a4861 Fixed issue #167 - removed operator ValueType() condition for VS2015 2016-01-23 16:34:15 +10:00
Niels f854410542 added a note wrt. Valgrind (#175) 2016-01-20 21:20:41 +01:00
Niels 5c4624c351 wishlist 2016-01-20 21:15:10 +01:00
Niels a04bd4f851 cleanup after #184 2016-01-20 21:14:58 +01:00
Niels 663ad13fc3 Merge pull request #184 from dariomt/master 
Implementation of get_ref()
 2016-01-20 20:58:44 +01:00
dariomt db3c7fdb96 added missing template keyword (required by clang) 2016-01-19 16:20:27 +01:00
dariomt e2f0e8b945 added missing typename (required by clang/gcc) 2016-01-19 14:56:07 +01:00
dariomt 4d079d135e replicate code changes into re2c file 2016-01-18 11:32:24 +01:00
dariomt e1645a09e9 Merge branch 'master' of https://github.com/nlohmann/json 2016-01-18 10:08:58 +01:00
Niels 72e33eec1a thanks 2016-01-15 08:24:44 +01:00
Niels 8968885c61 Merge pull request #182 from nibroc/master 
Fixed some typos in CONTRIBUTING.md
 2016-01-15 07:21:07 +01:00
Corbin Hughes 8ecccf8628 Fixed some typos in CONTRIBUTING.md 2016-01-14 22:36:39 -06:00
Niels c0bb5a56eb added note on assertions (#168) 2016-01-13 21:08:46 +01:00
Niels a05f27867b fixed wrong file name 2016-01-13 20:37:05 +01:00
Niels 832fe49bc1 fixed lists 2016-01-13 20:26:47 +01:00
Niels 57e018483a it's 2016 already... 2016-01-13 20:19:05 +01:00
Niels 1741e58eb5 contribution guidelines (#175) 2016-01-13 20:18:06 +01:00
Niels 4511145d3d removing unused catch variables (fixes #180) 2016-01-13 19:19:35 +01:00