1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Commit Graph

2620 Commits

Author SHA1 Message Date
392c033805 test refactoring 2018-03-11 00:29:04 +03:00
51349537fc add unit test: checking dump to alternative string type 2018-03-10 23:59:10 +03:00
830f3e5290 forward alternative string class from output_adapter to output_string_adapter 2018-03-10 23:58:16 +03:00
ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code) 2018-03-10 17:36:51 +03:00
faccc37d0d dump to alternate implementation of string, as defined in basic_json template 2018-03-10 17:19:28 +03:00
149d2fd09c 💚 improved test coverage 2018-03-10 11:24:00 +01:00
6399cd3039 Merge branch 'develop' into feature/sax2 2018-03-10 11:07:36 +01:00
6151dfaed7 👌 made changes proposed in #1001 2018-03-10 11:02:58 +01:00
35e43df625 Merge branch 'develop' into feature/sax2 2018-03-09 21:56:30 +01:00
9918523077 📝 cleanup after #1001 2018-03-09 21:31:46 +01:00
e737de8941 Merge pull request #1001 from nlohmann/leak
Fix memory leak during parser callback
2018-03-09 21:23:00 +01:00
aa8fc2a41c 🚑 hopefully fixed the memory leak 2018-03-08 17:11:15 +01:00
7c1a788893 Merge branch 'develop' into feature/sax2 2018-03-08 07:39:37 +01:00
cf60e18c89 🔥 removing failing test (work on this in branch "leak") 2018-03-08 07:39:21 +01:00
97559bb1b2 🔨 trying to fix the leak
Part 1: properly use forwarding
2018-03-08 07:36:56 +01:00
38345fd06c 👌 fixed some more warnings 2018-03-07 22:51:22 +01:00
8b379948d0 🔥 replaced acceptor with SAX parser 2018-03-07 22:40:48 +01:00
303a0c5843 Merge branch 'develop' into feature/sax2 2018-03-07 22:26:01 +01:00
d183d34b96 💚 added another test case 2018-03-07 22:25:25 +01:00
d2d65bb25b ♻️ refined SFINAE to fix some warnings 2018-03-07 22:01:44 +01:00
476b2e09be 💚 added regression tests for #972 and #977 2018-03-06 20:13:31 +01:00
62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
Fix/basic json conversion
2018-03-06 19:27:39 +01:00
5beab80553 🔨 using the SAX-DOM parser 2018-03-06 18:17:07 +01:00
faf2546a15 🔨 simplified SAX-DOM parser 2018-03-06 07:19:05 +01:00
5b9d03cfdb 🔨 added SAX-DOM-Parser 2018-03-05 21:06:00 +01:00
9d27429527 🔨 added error messages to SAX interface 2018-03-05 16:46:35 +01:00
86991d5204 Merge branch 'develop' into feature/sax2 2018-03-05 16:16:43 +01:00
fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
fixed misprinted condition detected by PVS Studio.
2018-03-05 15:57:57 +01:00
fd30ad8a14 did make amalgamate 2018-03-02 11:47:35 +03:00
2a2ed799b1 pvs_studio fix. misprinted condition 2018-03-02 11:12:44 +03:00
8d104e6fe3 💚 fixed test case 2018-02-28 22:40:48 +01:00
5773e164bb 🚨 fixed a linter warning 2018-02-28 19:59:54 +01:00
8711ec6034 support construction from other basic_json types
Before this patch, `basic_json` types with different template arguments
were treated as `CompatibleArrayType`. Which sometimes leads to recursive
calls and stack overflows.

This patch adds a constructor and a `get` overload to deal with
different `basic_json` types.
2018-02-27 16:48:09 +01:00
c22f2d41f3 missing CHECK_NOTHROW in unit-udt 2018-02-27 11:09:53 +01:00
3ff9455332 🔨 added a SAX-DOM-Parser 2018-02-26 23:39:23 +01:00
21352c4d8e ♻️ refactored SAX parser 2018-02-26 20:08:12 +01:00
981e226ca2 Merge branch 'develop' into feature/sax2 2018-02-26 20:07:52 +01:00
1f3d2a3be7 📝 overworked README 2018-02-26 17:37:24 +01:00
13ca723c38 Merge pull request #981 from wla80/develop
Make integration section concise
2018-02-26 16:51:51 +01:00
05d3bf1699 Make integration section concise 2018-02-25 22:12:44 -08:00
8d6b3d44d6 👌 fixed some compiler warnings 2018-02-25 18:35:16 +01:00
8c7f46f7d0 🔨 removed a logic error and improved coverage 2018-02-25 17:10:30 +01:00
922f7a3d0e added more tests for SAX parsing 2018-02-25 14:21:30 +01:00
ac230e8b4b 🔨 fixed test cases to be more robust 2018-02-25 10:44:47 +01:00
374ebacc51 added a SAX parser #971 2018-02-24 18:04:07 +01:00
8968adcd53 Merge branch 'release/3.1.1' into develop v3.1.1 2018-02-13 19:36:35 +01:00
8424d10e45 🔖 set version to 3.1.1 2018-02-13 15:59:32 +01:00
938c861a09 🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
94b7a8da66 💄 fixed indentation 2018-02-12 20:46:14 +01:00
20b5f4d89c Merge pull request #969 from theodelrieu/fix/924
Fix constraints on from_json(CompatibleArrayType)
2018-02-12 18:17:59 +01:00