1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-13 20:21:48 +03:00
Commit Graph

347 Commits

Author SHA1 Message Date
4bb5126502 more documentation 2015-06-21 18:30:08 +02:00
099030baeb added alias __basic_json 2015-06-21 13:04:03 +02:00
3e28c5ff8f commit to trigger build 2015-06-21 11:35:54 +02:00
d818bec6ac more documentation 2015-06-21 11:29:32 +02:00
c40e85920f more documentation 2015-06-21 09:44:12 +02:00
bb13c931b3 more documentation 2015-06-21 02:14:01 +02:00
e63c508172 overworked doxygen 2015-06-21 00:59:33 +02:00
4019380a8a forgot a header for MSVC 2015-06-20 17:45:52 +02:00
4fb825dbce fixed compiler warnings 2015-06-20 15:47:37 +02:00
719cc9e4d7 removed dependent to RTTI 2015-06-20 14:57:08 +02:00
18cd30d38d minor iterator refactoring (from #88) 2015-06-20 14:29:34 +02:00
23c904aca8 added fix for ssize_t for MSVC 2015-06-20 14:25:49 +02:00
dd3ffc1064 fixed issue #93 2015-06-19 08:11:48 +02:00
51edad3962 fixed #89 without breaking #71 2015-06-15 19:45:25 +02:00
8e9a711996 closes #90 2015-06-15 16:37:49 +02:00
2e9a13bd88 added extensive Unicode tests 2015-06-14 23:17:49 +02:00
6fb829062c some maintenance
- unified used exception types
- removed any camel case names
2015-06-14 19:35:20 +02:00
bd0cb65b7a fixed more float parsing cases 2015-06-13 12:42:18 +02:00
7c579f11e5 some cleanup after #87 2015-06-13 10:29:43 +02:00
7f25511242 change from #86 2015-06-11 18:10:12 +02:00
2d26d85c2b some cleanup 2015-06-08 16:35:38 +02:00
adc065d328 included fixes for MSVC (see #62)
94de11e, f673c8d, 540b763
2015-06-04 21:02:16 +02:00
b8d05f72ea fixed float serialization (#81 and #80) 2015-06-04 19:43:29 +02:00
266399d8e5 fixed MinGW compilation (#81 and #80) 2015-06-04 08:31:13 +02:00
9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +02:00
f5470d47ff made array static constexpr (#79) 2015-06-02 21:27:49 +02:00
afc7f2388e fixed typo (#74) 2015-06-02 21:24:03 +02:00
61f0376366 more cleanup 2015-05-10 17:30:41 +02:00
cb2102a2d2 some pretty-printing 2015-05-10 17:12:36 +02:00
43ededf41f more cleanup 2015-05-10 17:03:50 +02:00
76d3433e6c moved some code to json_value union 2015-05-10 16:30:33 +02:00
5ed80d308d some parsing performance improvements 2015-05-09 22:49:21 +02:00
9cdd278f45 overworked code for pull request #71 2015-05-09 15:29:20 +02:00
aca3f65bbe Merge pull request #71 from likebeta/master
support enum
2015-05-09 15:23:51 +02:00
2b4e461702 fixed string definition 2015-05-09 15:09:52 +02:00
1f381d496d overworked coverage 2015-05-09 14:54:33 +02:00
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
a8e92a6bfb fixed #68 2015-05-06 20:18:16 +02:00
17609f244d fixed #70 2015-05-06 19:52:12 +02:00
1580eee4ed applied #69 to header 2015-05-04 23:31:34 +02:00
1ac4d673b6 fixed test case 2015-05-03 18:46:26 +02:00
952cbbc795 manually merged pull request #41 2015-05-03 17:52:13 +02:00
faae8bb843 some typename fix 2015-04-27 23:09:51 +02:00
81d3973151 undid changes that broke the build 2015-04-26 21:51:35 +02:00
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
f09df96742 updated README 2015-04-26 15:16:07 +02:00
7a32bd22e9 Merge pull request #63 from Florianjw/master
Improve the implementations of the comparission-operators
2015-04-26 15:10:32 +02:00
c7f95cc636 minor change to the parsing of objects/arrays 2015-04-26 15:10:04 +02:00
4fbff7d140 simplify value_t::operator< by using a lookup-table 2015-04-26 14:55:06 +02:00