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

426 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels d3b0f207b0 Merge pull request #85 from ahamez/master 
Avoid warning with Xcode's clang
 2015-06-08 16:32:37 +02:00
Alexandre Hamez f17733b859 Directly return ostream 2015-06-08 11:39:32 +02:00
Alexandre Hamez c49d83172f Avoid warning with Xcode's clang 2015-06-08 11:38:52 +02:00
Niels adc065d328 included fixes for MSVC (see #62) 
94de11e, f673c8d, 540b763
 2015-06-04 21:02:16 +02:00
Niels 29512ae989 added test case for #82 2015-06-04 20:07:33 +02:00
Niels b8d05f72ea fixed float serialization (#81 and #80) 2015-06-04 19:43:29 +02:00
Niels 266399d8e5 fixed MinGW compilation (#81 and #80) 2015-06-04 08:31:13 +02:00
Niels 5f4fd0b6a2 reset 2015-06-03 23:44:45 +02:00
Niels 9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +02:00
Niels cb873a42ed added Benchpress benchmarks 2015-06-02 23:57:45 +02:00
Niels f5470d47ff made array static constexpr (#79) 2015-06-02 21:27:49 +02:00
Niels afc7f2388e fixed typo (#74) 2015-06-02 21:24:03 +02:00
Niels e2035df957 added unit test for issue #76 2015-05-30 16:47:21 +02:00
Niels 58d7342be7 Merge pull request #73 from maqnouch/patch-1 
Fix typos
 2015-05-12 17:29:50 +02:00
AQNOUCH Mohammed 7da56cf292 Fix typos 2015-05-12 14:59:44 +01:00
Niels 61f0376366 more cleanup 2015-05-10 17:30:41 +02:00
Niels cb2102a2d2 some pretty-printing 2015-05-10 17:12:36 +02:00
Niels 072dc25521 Merge pull request #72 from aburgh/null-callback 
Replace `default_callback` function with `nullptr` and check for null…
 2015-05-10 17:10:47 +02:00
Niels 43ededf41f more cleanup 2015-05-10 17:03:50 +02:00
Aaron Burghardt ef54ace4d2 Replace default_callback function with nullptr and check for null callback function before calling it. This is cleaner and better performing. 2015-05-10 10:32:49 -04:00
Niels 76d3433e6c moved some code to json_value union 2015-05-10 16:30:33 +02:00
Niels 5ed80d308d some parsing performance improvements 2015-05-09 22:49:21 +02:00
Niels abb8653115 more test cases 2015-05-09 16:58:06 +02:00
Niels 03634cacbc cleanup 2015-05-09 15:38:58 +02:00
Niels 165d367493 updated README 2015-05-09 15:30:17 +02:00
Niels 9cdd278f45 overworked code for pull request #71 2015-05-09 15:29:20 +02:00
Niels aca3f65bbe Merge pull request #71 from likebeta/master 
support enum
 2015-05-09 15:23:51 +02:00
Niels 2b4e461702 fixed string definition 2015-05-09 15:09:52 +02:00
Niels 1f381d496d overworked coverage 2015-05-09 14:54:33 +02:00
Niels bb142d6cae added test cases 2015-05-09 14:37:22 +02:00
Niels 869035a6c9 added compliance test cases 2015-05-09 13:56:51 +02:00
易思龙 91aee10579 support enum 
construct enum type to basic_json (proxy by int type)
```
    enum { t = 0 };
    json  j = json::array();
    j.push_back(t);

    j.push_back(json::object({
         {"game_type", t}
    }));
```
 2015-05-09 17:44:10 +08:00
Niels 9f9d293bad valgrind still makes problems 2015-05-06 21:32:41 +02:00
Niels b67b13c29e Appveyor 2015-05-06 20:48:20 +02:00
Niels bef256600c added test cases 2015-05-06 20:46:04 +02:00
Niels 2cfc93fc76 overflows are handled wrong by Valgrind 2015-05-06 20:21:06 +02:00
Niels a8e92a6bfb fixed #68 2015-05-06 20:18:16 +02:00
Niels 17609f244d fixed #70 2015-05-06 19:52:12 +02:00
Niels 1580eee4ed applied #69 to header 2015-05-04 23:31:34 +02:00
Niels 723155a30a Merge pull request #69 from aburgh/callback_performance 
Fix performance regression introduced with the parsing callback feature.
 2015-05-04 15:39:44 +02:00
Aaron Burghardt ea3e922a12 Fix performance regression introduced with the parsing callback feature. 2015-05-04 09:08:55 -04:00
Niels 2b825760b5 removed failing test case 2015-05-03 21:37:14 +02:00
Niels 07dd3af848 another try 2015-05-03 21:28:57 +02:00
Niels 370929ac08 overworked test case 2015-05-03 21:10:22 +02:00
Niels c458bf18e6 more test cases 2015-05-03 20:59:11 +02:00
Niels 106705ed73 more tests 2015-05-03 20:42:24 +02:00
Niels 10bbb77491 test case for filter function 2015-05-03 20:18:16 +02:00
Niels 1143094e4c testing the callback function 2015-05-03 20:07:31 +02:00
Niels 093b97efc4 more tests 2015-05-03 19:55:45 +02:00
Niels f66e603686 more test cases 2015-05-03 18:59:58 +02:00