1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Commit Graph

817 Commits

Author SHA1 Message Date
fa3e42f826 Merge branch 'develop' into feature/wstring 2018-04-29 13:16:12 +02:00
65b4d8251b Fix typo in single_include, too 2018-04-17 13:02:36 +02:00
8d8f890771 💩 first try on #1045 2018-04-10 08:29:07 +02:00
cf91b4f2bb Merge branch 'develop' into feature/wstring 2018-04-08 11:36:58 +02:00
e1ea8369ad Merge branch 'develop' into feature/sax2 2018-04-08 09:31:59 +02:00
08a7233d1b 🚑 fixed commit 1e08654 2018-04-02 22:38:44 +02:00
1e08654f99 🔨 cleanup 2018-04-02 22:25:17 +02:00
aa89c5e048 🔨 removing unget_character() function from input adapters #834 2018-04-02 21:10:48 +02:00
16c5bfeaad 👌 fixed compiler warnings #1031 2018-04-02 13:01:56 +02:00
eb06d0531a 🚧 added input adapter for wide strings #1031 2018-04-01 19:12:36 +02:00
ba6edd5634 🔨 cleanup 2018-03-30 00:38:18 +02:00
850671b9f1 🔨 using a vector<bool> for the parser hierarchy 2018-03-29 18:45:43 +02:00
53d8d57921 Amalgamate single include 2018-03-29 01:03:36 -04:00
5f723bbec6 🔨 realized callback parser wirh SAX interface #971 2018-03-28 23:39:39 +02:00
896a9db461 🔨 improved code #1021 2018-03-28 19:37:21 +02:00
a9baab76c2 🚑 fix for #1021 2018-03-28 18:20:55 +02:00
4f6b2b6429 🔨 changed SAX interface 2018-03-21 20:12:06 +01:00
9e1abb4842 improved coverage 2018-03-20 22:39:08 +01:00
25f56ff207 📝 updated documentation 2018-03-20 19:22:18 +01:00
99ecca55c4 improved test coverage 2018-03-20 18:49:10 +01:00
9e07e9b4ec implemented non-throwing binary reader 2018-03-19 22:48:13 +01:00
a271ee5f16 ♻️ proper use of SAX parser for binary formats 2018-03-18 23:00:45 +01:00
943d641054 🔨 some refactoring 2018-03-18 16:07:21 +01:00
22929fe189 🚧 started a SAX/DOM/callback parser 2018-03-18 15:13:53 +01:00
375b05a17d 🔨 cleanup 2018-03-17 23:31:18 +01:00
606a25195f improved test coverage 2018-03-17 19:15:59 +01:00
c87ffad45c ♻️ implemented a non-recursive parser 2018-03-17 14:46:50 +01:00
2a5506ed98 Amalgamated headers 2018-03-16 13:16:10 -04:00
27cf05af8d Merge branch 'develop' into feature/sax2 2018-03-14 22:02:19 +01:00
afef474c0d 🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
282bafae4f 🔨 fixed compilation error 2018-03-14 07:18:42 +01:00
abac6a0e84 Merge branch 'develop' into feature/sax2 2018-03-13 23:58:17 +01:00
8557151d90 ♻️ adjusting lexer/parser in symmetry to #1006 2018-03-12 19:15:11 +01:00
3d4f6a2940 🔨 cleaner exception interface 2018-03-11 22:47:25 +01:00
ad47b0fbde ♻️ refactored binary readers to use a SAX parser 2018-03-11 18:47:38 +01: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
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
aa8fc2a41c 🚑 hopefully fixed the memory leak 2018-03-08 17:11:15 +01:00
97559bb1b2 🔨 trying to fix the leak
Part 1: properly use forwarding
2018-03-08 07:36:56 +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
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