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

101 Commits

Author SHA1 Message Date
aea648bb7a remove now-useless traits. check for is_basic_json where needed 2018-09-07 14:10:39 +02:00
bbdfe7dea6 Improve error messages for error 305
Addresses #1220
2018-08-30 12:35:51 -04:00
9f3857ef6f 🔖 set version to 3.2.0 2018-08-18 18:46:15 +02:00
c6a482b16c 📝 added example for sax_parse 2018-08-18 15:42:18 +02:00
3811daa8a3 📝 release preparation 2018-08-18 12:00:14 +02:00
b5c54b41fd 📝 overworked documentation 2018-08-16 21:53:47 +02:00
38f8a51a8f use abstract sax class in parser tests 2018-08-16 11:59:49 +02:00
442886d040 use templates in the sax interface instead of virtuals 2018-08-16 11:58:52 +02:00
f6febbe359 split meta.hpp, add detected_t (used to define concepts) 2018-08-16 11:58:42 +02:00
3ac2d81a95 🔨 fixed a MinGW error #1193 2018-08-14 22:13:56 +02:00
0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch
[RFC] Introduce a new macro function: JSON_INTERNAL_CATCH
2018-08-14 21:56:29 +02:00
04372a8c56 🏁 fix for #1168 2018-07-19 17:31:50 +02:00
d0e60de433 Add new JSON_INTERNAL_CATCH macro function 2018-07-19 15:43:41 +09:00
963d06a13c 📝 fix links to cppreference named requirements
"Concepts" have been renamed to "named requirements".
This is because P0898R3 Standard Library Concepts has been merged into
C++20.
Cppreference have moved their links accordingly.
2018-06-24 22:36:19 +02:00
9f00db48d9 📝 link to cppreference via HTTPS 2018-06-24 22:34:47 +02:00
bf348ca8a4 Merge pull request #1028 from gracicot/develop
Added support for string_view in C++17
2018-06-23 17:10:04 +02:00
85f35a1d59 📝 documentation fix 2018-06-22 22:34:42 +02:00
4778c02ab5 Set MSVC version from 1514 and older 2018-06-01 14:42:25 -04:00
714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older 2018-06-01 14:22:57 -04:00
5ff2abb90d Merge branch 'develop' into feature/sax2 2018-05-06 13:29:23 +02:00
ed69e50ad2 📄 added SPDX-License-Identifier 2018-05-03 17:41:45 +02:00
53fb230098 Fix typo 2018-04-17 12:08:44 +02:00
9e1abb4842 improved coverage 2018-03-20 22:39:08 +01:00
25f56ff207 📝 updated documentation 2018-03-20 19:22:18 +01:00
9e07e9b4ec implemented non-throwing binary reader 2018-03-19 22:48:13 +01:00
22929fe189 🚧 started a SAX/DOM/callback parser 2018-03-18 15:13:53 +01: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
abac6a0e84 Merge branch 'develop' into feature/sax2 2018-03-13 23:58:17 +01:00
ad47b0fbde ♻️ refactored binary readers to use a SAX parser 2018-03-11 18:47:38 +01:00
faccc37d0d dump to alternate implementation of string, as defined in basic_json template 2018-03-10 17:19:28 +03: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
97559bb1b2 🔨 trying to fix the leak
Part 1: properly use forwarding
2018-03-08 07:36:56 +01:00
303a0c5843 Merge branch 'develop' into feature/sax2 2018-03-07 22:26:01 +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
5b9d03cfdb 🔨 added SAX-DOM-Parser 2018-03-05 21:06:00 +01:00
86991d5204 Merge branch 'develop' into feature/sax2 2018-03-05 16:16:43 +01:00
2a2ed799b1 pvs_studio fix. misprinted condition 2018-03-02 11:12:44 +03: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
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
8c7f46f7d0 🔨 removed a logic error and improved coverage 2018-02-25 17:10:30 +01:00
374ebacc51 added a SAX parser #971 2018-02-24 18:04:07 +01:00
938c861a09 🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
865ff00de0 📝 updated documentation wrt. objects #963 2018-02-09 23:37:20 +01:00
0258484626 🔖 set version to 3.1.0
- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018
2018-02-01 22:20:26 +01:00