haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-23 13:32:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
436 commits 13 branches 56 tags 227 MiB
Commit graph

237 commits

Author SHA1 Message Date
Niels bd0cb65b7a fixed more float parsing cases 2015-06-13 12:42:18 +02:00
Niels 7c579f11e5 some cleanup after #87 2015-06-13 10:29:43 +02:00
Niels a8339894b2 Merge pull request #87 from ahamez/master 
Keyword 'inline' is useless when member functions are defined in headers
 2015-06-13 10:27:24 +02:00
Alexandre Hamez a8aced74bc inline is useless when member functions are defined in headers 
See https://isocpp.org/wiki/faq/inline-functions#inline-member-fns-more
 2015-06-12 10:08:57 +02:00
Niels 7f25511242 change from #86 2015-06-11 18:10:12 +02:00
Alexandre Hamez 41e9e000bf Remove useless typename 
Avoid a warning with GCC 4.9:

son.hpp:2361:49: warning: declaration 'struct std::bidirectional_iterator_tag' does not declare anything
         using iterator_category = typename std::bidirectional_iterator_tag;
                                                 ^
 2015-06-09 13:31:10 +02:00
Niels 2d26d85c2b some cleanup 2015-06-08 16:35:38 +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 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 9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +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 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 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 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 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
Aaron Burghardt ea3e922a12 Fix performance regression introduced with the parsing callback feature. 2015-05-04 09:08:55 -04:00
Niels 1ac4d673b6 fixed test case 2015-05-03 18:46:26 +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 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
Niels 89a8491914 minor changes 2015-04-25 01:25:42 +02:00
Niels fc58a73523 fix #60 (double escaping) 2015-04-24 22:06:57 +02:00
Niels 2dd94dd943 some simplifications 2015-04-12 17:26:54 +02:00