haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-15 10:55:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
393 commits 12 branches 56 tags 226 MiB
Commit graph

393 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Niels 1ac4d673b6 fixed test case 2015-05-03 18:46:26 +02:00
Niels ab1ff9de53 added more test cases 2015-05-03 18:27:43 +02:00
Niels 84561d8866 improved test case coverage 2015-05-03 18:19:12 +02:00
Niels 952cbbc795 manually merged pull request #41 2015-05-03 17:52:13 +02:00
Niels faae8bb843 some typename fix 2015-04-27 23:09:51 +02:00
Niels 14e54b2b72 Appveyor 2015-04-27 22:53:46 +02:00
Niels ecc97bcf96 added /EHsc parameter 2015-04-27 22:45:21 +02:00
Niels 1068ad106b fixed Makefile 2015-04-27 22:35:45 +02:00
Niels e7da0b4b7c Appveyor 2015-04-26 23:56:42 +02:00
Niels 0c0a462c28 Appveyor 2015-04-26 23:47:11 +02:00
Niels 257bf46133 Appveyor 2015-04-26 23:41:11 +02:00
Niels c16ee07601 Appveyor 2015-04-26 23:31:22 +02:00
Niels 35485c05e3 Appveyor 2015-04-26 23:21:16 +02:00
Niels f3447b2b80 Appveyor 2015-04-26 23:14:51 +02:00
Niels 4a3c0edb75 Appveyor 2015-04-26 23:09:10 +02:00
Niels 4c7fbd7647 Appveyor 2015-04-26 23:03:15 +02:00
Niels 711e465f4a Appveyor test 2015-04-26 22:53:17 +02:00
Niels 1e20bfa14a another try 2015-04-26 22:47:40 +02:00
Niels ae2676e7f0 fixed Makefile 2015-04-26 22:25:38 +02:00
Niels 5e0d4d3830 does not 2015-04-26 22:09:15 +02:00
Niels a3ca1ae217 trying appveyor again 2015-04-26 22:00:20 +02:00
Niels 81d3973151 undid changes that broke the build 2015-04-26 21:51:35 +02:00
Niels f874b5f0f8 clean up 
- removed m_final member
- parse_internal now takes a reference to a basic_json object to fill
with data
- header is automatically regenerated if re2c file is changed
 2015-04-26 21:43:47 +02:00
Niels f09df96742 updated README 2015-04-26 15:16:07 +02:00
Niels 7a32bd22e9 Merge pull request #63 from Florianjw/master 
Improve the implementations of the comparission-operators
 2015-04-26 15:10:32 +02:00
Niels c7f95cc636 minor change to the parsing of objects/arrays 2015-04-26 15:10:04 +02:00
Florian Weber 4fbff7d140 simplify value_t::operator< by using a lookup-table 2015-04-26 14:55:06 +02:00
Florian Weber f5e95522aa remove braces around single-return-statement switch-cases 2015-04-26 14:44:56 +02:00
Florian Weber d2771eb1bb Fix comparission between integers and floats 
Until now it depended on the parameter-order whether
integers and floats were compared as integers or floats.

Appart from being not logical, this might even have meant that
the provided “order” was in fact not that. (not sure here, but I
like to be carefull)
 2015-04-26 14:39:39 +02:00
Florian Weber 306695dd25 fix typos and improve operator== 2015-04-26 14:31:31 +02:00
Florian Weber 28f64c22a9 simplify operator< 2015-04-26 14:19:56 +02:00
Niels a372937424 fixed some small issues 2015-04-26 13:37:01 +02:00
Niels e3ab0bc74a addressing issue #62 2015-04-25 23:10:23 +02:00