Niels Lohmann
|
ab6e76dd05
|
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type
|
2020-05-17 12:27:58 +02:00 |
|
Niels Lohmann
|
6154d50a9f
|
Merge pull request #2115 from nlohmann/issue2089
Do not include <ciso646> when using C++17
|
2020-05-17 12:17:17 +02:00 |
|
Niels Lohmann
|
c0cf67ead3
|
Merge branch 'develop' of https://github.com/nlohmann/json into binary_type
|
2020-05-16 12:58:13 +02:00 |
|
Niels Lohmann
|
f40a9f876a
|
Merge pull request #2044 from dota17/issue#1719
Fix issue#1719
|
2020-05-16 12:57:00 +02:00 |
|
Niels Lohmann
|
bc1886fb60
|
♻️ refine interface of wrapped_binary_t
|
2020-05-15 23:21:49 +02:00 |
|
Niels Lohmann
|
daf2d296dd
|
♻️ move wrapped binary type to separate file
|
2020-05-15 14:12:32 +02:00 |
|
Niels Lohmann
|
bcf4f3ce9a
|
📝 add warning for items() on temporary objects #2040
|
2020-05-14 19:06:48 +02:00 |
|
chenguoping
|
44fe284f9d
|
Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float
|
2020-05-14 15:10:44 +08:00 |
|
Niels Lohmann
|
a4266bbb7d
|
Merge branch 'develop' into issues/1457
|
2020-05-13 12:48:46 +02:00 |
|
Niels Lohmann
|
b036ace235
|
🐛 fix bug in binary constructor
|
2020-05-09 14:16:49 +02:00 |
|
Niels Lohmann
|
f0c6ab4d3b
|
🐛 fix bug in SAX callback parser
|
2020-05-08 14:21:11 +02:00 |
|
Niels Lohmann
|
9adb1c0235
|
🏁 do not include <ciso646> unless old MSVC is used #2089
|
2020-05-07 09:43:41 +02:00 |
|
Niels Lohmann
|
421a084396
|
✨ add convenience function to create binary value with given subtype
|
2020-05-06 21:23:45 +02:00 |
|
Niels Lohmann
|
6dee8866a8
|
🐛 fix binary comparison
|
2020-05-05 12:40:04 +02:00 |
|
Niels Lohmann
|
48aa441661
|
✨ add swap function for binary type
|
2020-05-04 22:07:36 +02:00 |
|
Niels Lohmann
|
db013c9428
|
Merge pull request #2071 from nlohmann/issue2067
Properly pass serialize_binary to dump function
|
2020-04-29 19:39:58 +02:00 |
|
Niels Lohmann
|
2e5727d778
|
🐛 properly pass serialize_binary to dump function #2067
|
2020-04-27 15:10:23 +02:00 |
|
Niels Lohmann
|
9e0180b698
|
🐛 fix returning reference to local temporary object #2064
|
2020-04-27 14:43:49 +02:00 |
|
Niels Lohmann
|
a29e3b1318
|
Merge pull request #2054 from nlohmann/feature/issue1983
Fix bug in diff function
|
2020-04-20 19:44:35 +02:00 |
|
Niels Lohmann
|
e8356928bd
|
🚨 fix compiler warnings #2052
|
2020-04-19 13:25:02 +02:00 |
|
Niels Lohmann
|
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 |
|
Michael Reilly
|
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 |
|
Niels Lohmann
|
dd04a32918
|
🐛 fix bug in diff function #1983
|
2020-04-13 14:35:36 +02:00 |
|
Niels Lohmann
|
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 |
|
Niels Lohmann
|
b0a3883081
|
🎨 fix format
|
2020-04-13 13:11:26 +02:00 |
|
Artöm Bakri Al-Sarmini
|
ec955f08b4
|
Templatize basic_json ctor from json_ref
|
2020-04-12 22:32:39 +03:00 |
|
Niels Lohmann
|
4396a68d2d
|
Merge pull request #1984 from dota17/document-fix
Modify the document about operator==
|
2020-04-11 18:55:18 +02:00 |
|
Niels Lohmann
|
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 |
|
Artöm Bakri Al-Sarmini
|
e4d8dc02e8
|
Fixes #1971 (memory leak in basic_json::push_back)
|
2020-04-02 15:20:25 +03:00 |
|
chenguoping
|
2e7d340dad
|
docs:modify the document about operator==
|
2020-03-25 10:18:04 +08:00 |
|
garethsb-sony
|
7fe16f9400
|
PR for #2006 to test in AppVeyor.
|
2020-03-24 12:53:59 +00:00 |
|
Francois Chabot
|
2e2cf02cfd
|
duck-typed object input adapters
|
2020-02-19 14:59:31 -05:00 |
|
Francois Chabot
|
a0c4fc945a
|
fixed bad friend class declaration
|
2020-02-19 11:23:02 -05:00 |
|
Francois Chabot
|
617b3cf42e
|
templated input adapters
|
2020-02-19 10:32:49 -05:00 |
|
Antoine Cœur
|
8d92ca865f
|
Some typos
|
2020-02-02 17:29:37 +08:00 |
|
Niels Lohmann
|
c5eafe74e8
|
🔖 set version to 3.7.3
|
2019-11-17 12:09:12 +01:00 |
|
Isaac Nickaein
|
efa13c663d
|
Reserve stack only for top-level items
|
2019-11-13 15:23:08 +03:30 |
|
Isaac Nickaein
|
948f98cf4a
|
Cleanups
Make our intent more clear in destruction
|
2019-11-12 22:24:11 +03:30 |
|
Isaac Nickaein
|
0f3ec003bb
|
Remove harmful vector::reserve during destruction (#1837)
|
2019-11-12 22:22:55 +03:30 |
|
Niels Lohmann
|
be61ad1470
|
🎨 fix inconsistent operator style
|
2019-11-11 21:37:32 +01:00 |
|
Niels Lohmann
|
56109eacd7
|
🔖 set version to 3.7.2
|
2019-11-10 21:23:39 +01:00 |
|
Isaac Nickaein
|
eec1974218
|
Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
|
2019-11-09 14:50:48 +03:30 |
|
Niels Lohmann
|
aacdc6bbe3
|
🔖 set version to 3.7.1
|
2019-11-06 18:37:26 +01:00 |
|
Anthony Van Herrewege
|
27d0dfc17a
|
Fix #1647: non-member operator== breaks enum (de)serialization.
|
2019-10-30 14:54:52 +01:00 |
|
Florian Pigorsch
|
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 |
|
Miguel Sacristan
|
e26a2904fc
|
Fix and add test's for SFINAE problem
|
2019-09-10 21:36:23 +02:00 |
|
Niels Lohmann
|
48e1fe03b5
|
🔖 set version to 3.7.0
|
2019-07-28 20:20:41 +02:00 |
|
Niels Lohmann
|
a501365ea2
|
Merge branch 'feature/hedley' into develop
|
2019-07-14 20:58:08 +02:00 |
|
Niels Lohmann
|
104c5c1996
|
Merge branch 'feature/json_pointer_contains' into develop
|
2019-07-09 08:08:56 +02:00 |
|
Niels Lohmann
|
7a23aa1c0d
|
Merge branch 'feature/emplace_back' into develop
|
2019-07-09 08:06:27 +02:00 |
|