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
675 commits 11 branches 56 tags 222 MiB
Commit graph

675 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
Niels 151d43f63e fixing numerous typos (fixes #179) 2016-01-13 19:14:33 +01:00
Niels 4a452f11f9 added assertions (#168) 2016-01-03 17:05:27 +01:00
Niels d27c8a8ea8 reverting OSX 2016-01-02 16:49:56 +01:00
Niels fb7ff414ad more Valgrind information 2016-01-02 16:42:45 +01:00
Niels 2d48a36f5c trying Travis and OSX 2016-01-02 16:37:40 +01:00
Niels b4bb3afb65 removed clang 3.8 2016-01-02 15:42:56 +01:00
Niels 4a87ed4441 trying Clang 3.8 2016-01-02 15:34:34 +01:00
Niels 33abe87407 forgot version number 2016-01-02 15:30:12 +01:00
Niels dbf58ae9c0 trying to add Clang 3.7 toolchain 2016-01-02 15:24:13 +01:00
Niels 7614aa31c0 cleanup 2016-01-02 13:07:22 +01:00
Niels 9b07504e23 fix for #166 2016-01-01 18:33:58 +01:00
Niels 3905406f9c removed an unnecessary cast (fixed #162) 2015-12-29 12:30:05 +01:00
Niels aca6a3b373 version number 2015-12-28 15:04:15 +01:00
Niels cb5581392a preparing 1.0.0 release 2015-12-28 14:51:57 +01:00
Niels 80cdecaadd fixed a cppcheck warning 2015-12-27 18:07:21 +01:00
Niels d80bbffc78 minor cleanup 2015-12-27 17:58:36 +01:00
Niels 7371c71d2a using CHECK_THROWS_WITH to check exceptions (#160) 2015-12-27 15:30:30 +01:00
Niels d6b8830e03 more work on exceptions (#160) 2015-12-26 13:17:32 +01:00
Niels dc8ab92552 more tests for exceptions (#160) 2015-12-25 13:04:40 +01:00
Niels 76e5e29eda overworked exceptions and tests (#160) 2015-12-25 11:46:18 +01:00
Niels 8620583cf9 cleanup 2015-12-23 12:05:57 +01:00
Niels fcbd984e0f cleanup 2015-12-23 08:44:34 +01:00
Niels 70493a10d1 iterator_wrapper for const objects (#83) 2015-12-23 08:21:29 +01:00