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

349 Commits

Author SHA1 Message Date
48aa441661 add swap function for binary type 2020-05-04 22:07:36 +02:00
db013c9428 Merge pull request #2071 from nlohmann/issue2067
Properly pass serialize_binary to dump function
2020-04-29 19:39:58 +02:00
2e5727d778 🐛 properly pass serialize_binary to dump function #2067 2020-04-27 15:10:23 +02:00
9e0180b698 🐛 fix returning reference to local temporary object #2064 2020-04-27 14:43:49 +02:00
a29e3b1318 Merge pull request #2054 from nlohmann/feature/issue1983
Fix bug in diff function
2020-04-20 19:44:35 +02:00
e8356928bd 🚨 fix compiler warnings #2052 2020-04-19 13:25:02 +02:00
f2b43a36b2 Merge pull request #1662 from OmnipotentEntity/develop
Add binary type support to all binary file formats, as well as an internally represented binary type
2020-04-16 11:14:32 +02:00
012c9665ac Add binary type support to all binary file formats, as well as an internally represented binary type 2020-04-14 10:22:45 -04:00
dd04a32918 🐛 fix bug in diff function #1983 2020-04-13 14:35:36 +02:00
84f19d6333 Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types
Templatize basic_json constructor from json_ref
2020-04-13 13:19:28 +02:00
b0a3883081 🎨 fix format 2020-04-13 13:11:26 +02:00
ec955f08b4 Templatize basic_json ctor from json_ref 2020-04-12 22:32:39 +03:00
4396a68d2d Merge pull request #1984 from dota17/document-fix
Modify the document about operator==
2020-04-11 18:55:18 +02:00
ea0a7c7b4f Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back
Fixes #1971 (memory leak in basic_json::push_back)
2020-04-10 13:19:14 +02:00
e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) 2020-04-02 15:20:25 +03:00
2e7d340dad docs:modify the document about operator== 2020-03-25 10:18:04 +08:00
7fe16f9400 PR for #2006 to test in AppVeyor. 2020-03-24 12:53:59 +00:00
2e2cf02cfd duck-typed object input adapters 2020-02-19 14:59:31 -05:00
a0c4fc945a fixed bad friend class declaration 2020-02-19 11:23:02 -05:00
617b3cf42e templated input adapters 2020-02-19 10:32:49 -05:00
8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
c5eafe74e8 🔖 set version to 3.7.3 2019-11-17 12:09:12 +01:00
efa13c663d Reserve stack only for top-level items 2019-11-13 15:23:08 +03:30
948f98cf4a Cleanups
Make our intent more clear in destruction
2019-11-12 22:24:11 +03:30
0f3ec003bb Remove harmful vector::reserve during destruction (#1837) 2019-11-12 22:22:55 +03:30
be61ad1470 🎨 fix inconsistent operator style 2019-11-11 21:37:32 +01:00
56109eacd7 🔖 set version to 3.7.2 2019-11-10 21:23:39 +01:00
eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction 2019-11-09 14:50:48 +03:30
aacdc6bbe3 🔖 set version to 3.7.1 2019-11-06 18:37:26 +01:00
27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization. 2019-10-30 14:54:52 +01:00
b93d414a35 Fix some spelling errors - mostly in comments & documentation.
I did not touch the Changelog file and any third party stuff.

additonal -> additional (1)
apppend -> append (2)
constuctor -> constructor (2)
contect -> context (2)
dobulequote -> doublequote (1)
elemnts -> elements (1)
exakt -> exact (2)
exluded -> exclude (1)
explicitely -> explicitly (2)
narcissic -> narcissistic (1)
ocurred -> occurred (1)
occuring -> occurring (2)
preceeds -> preceded (1)
ot -> to (2)
wehther -> whether (2)
2019-10-19 11:59:51 +02:00
e26a2904fc Fix and add test's for SFINAE problem 2019-09-10 21:36:23 +02:00
48e1fe03b5 🔖 set version to 3.7.0 2019-07-28 20:20:41 +02:00
a501365ea2 Merge branch 'feature/hedley' into develop 2019-07-14 20:58:08 +02:00
104c5c1996 Merge branch 'feature/json_pointer_contains' into develop 2019-07-09 08:08:56 +02:00
7a23aa1c0d Merge branch 'feature/emplace_back' into develop 2019-07-09 08:06:27 +02:00
9289a23a76 Merge pull request #1643 from kevinlul/develop
Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)
2019-07-01 22:57:04 +02:00
90798caa62 🚚 rename Hedley macros 2019-07-01 22:37:30 +02:00
897362191d 🔨 add NLOHMANN_JSON prefix and undef macros 2019-07-01 22:24:39 +02:00
1720bfedd1 ⚗️ add Hedley annotations 2019-06-30 22:14:02 +02:00
1be63431f3 make emplace_back return a reference #1609 2019-06-30 12:19:41 +02:00
258fa798f1 add contains function for JSON pointers 2019-06-30 10:03:08 +02:00
3b82a350ed 📝 mention 302 exception in value() documentation #1601 2019-06-22 09:44:12 +02:00
f4fca2d59a Fix #1642
While in our case, only the string case was affected, to be safe and allow the library to work with other unforeseen cases, all of the cases have been wrapped with parentheses.

Thank you @DyXel and @edo9300
2019-06-16 18:22:40 -04:00
aa4c45ee4d Added to_string (with ugly macro) and tests 2019-04-26 18:10:45 -05:00
e6e6805c6c add built-in array support in get_to 2019-04-01 17:47:45 +02:00
efa1b9a7bb 🔖 set version to 3.6.1 2019-03-20 20:50:05 +01:00
b33093d610 🐛 fixed regression #1530 2019-03-20 14:40:23 +01:00
c790b9f8c0 🐛 fixed regression #1530 2019-03-20 12:41:08 +01:00
b37392b7ac 🔖 set version to 3.6.0 2019-03-20 00:19:07 +01:00