1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-19 17:03:16 +03:00
Commit Graph

784 Commits

Author SHA1 Message Date
dead99eb0e 🔨 overwork binary subtypes 2020-05-17 13:51:59 +02:00
ab6e76dd05 Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-17 12:27:58 +02:00
3799b3f8dd Merge pull request #2116 from nlohmann/issue2113
Fix warnings from Clang 10 and GCC 9
2020-05-17 12:19:06 +02:00
6154d50a9f Merge pull request #2115 from nlohmann/issue2089
Do not include <ciso646> when using C++17
2020-05-17 12:17:17 +02:00
28e20bd9e4 🚨 fix warnings #2113 2020-05-16 14:26:17 +02:00
c0cf67ead3 Merge branch 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-16 12:58:13 +02:00
f40a9f876a Merge pull request #2044 from dota17/issue#1719
Fix issue#1719
2020-05-16 12:57:00 +02:00
3ed059f6ff revert faulty changes 2020-05-16 12:56:18 +02:00
bc1886fb60 ♻️ refine interface of wrapped_binary_t 2020-05-15 23:21:49 +02:00
a452e8a0a1 💚 fix GCC 4.9 compilation 2020-05-15 22:38:18 +02:00
5dd27f1a9f compare against max float and min float before converting 2020-05-15 21:47:59 +08:00
daf2d296dd ♻️ move wrapped binary type to separate file 2020-05-15 14:12:32 +02:00
779a0ec7df update 2020-05-15 17:35:43 +08:00
bcf4f3ce9a 📝 add warning for items() on temporary objects #2040 2020-05-14 19:06:48 +02:00
e175150f5b fix UBSAN 2020-05-14 20:54:47 +08:00
44fe284f9d Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float 2020-05-14 15:10:44 +08:00
0857140839 Merge pull request #1950 from FrancoisChabot/issues/1457
templated input adapters
2020-05-14 07:52:02 +02:00
cdf5327ace Fix issue#2086 2020-05-14 12:44:30 +08:00
d7b032f565 add tests to improve coverage 2020-05-13 21:28:43 +02:00
a4266bbb7d Merge branch 'develop' into issues/1457 2020-05-13 12:48:46 +02:00
5c42847011 add tests for binary type 2020-05-10 13:23:18 +02:00
fff46ea98c add tests for binary type 2020-05-09 23:18:12 +02:00
b036ace235 🐛 fix bug in binary constructor 2020-05-09 14:16:49 +02:00
f0c6ab4d3b 🐛 fix bug in SAX callback parser 2020-05-08 14:21:11 +02:00
8c2b26de4a ⚗️ do not include <ciso646> with C++20 #2089 2020-05-07 10:17:32 +02:00
9adb1c0235 🏁 do not include <ciso646> unless old MSVC is used #2089 2020-05-07 09:43:41 +02:00
c10bc7efdd 🔥 remove pretty-print code for binary values 2020-05-06 22:13:08 +02:00
421a084396 add convenience function to create binary value with given subtype 2020-05-06 21:23:45 +02:00
6dee8866a8 🐛 fix binary comparison 2020-05-05 12:40:04 +02:00
48aa441661 add swap function for binary type 2020-05-04 22:07:36 +02:00
f0050c9ba0 Merge pull request #2019 from dota17/contains_v2
fix #1982:json_pointer.contains() exception is incorrectly raised
2020-05-02 11:04:57 +02:00
6815968a42 Fix error message about invalid surrogate pairs
I tested following strings with invalid surrogate pair and unpaired surrogate in files:

1. `"a\uD800\uD800x"`
2. `"a\uD800x"`

The error messge was: "... invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; ..."

I think it must be: "... invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; ..."
2020-05-01 00:23:04 +03: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
8bfc692602 update condition 2020-04-20 16:00:55 +08:00
3607687a14 Merge pull request #2053 from nlohmann/gcc10warnings
Fix GCC compiler warnings
2020-04-20 08:05:42 +02:00
e8356928bd 🚨 fix compiler warnings #2052 2020-04-19 13:25:02 +02:00
4fb0795ec1 🚨 fix compiler warnings #2049 2020-04-19 13:01:36 +02:00
3bc9e053c9 Merge pull request #1969 from dota17/dota17-warning
fix warnings in serializer.hpp for VS2019
2020-04-17 10:10:38 +02:00
69ac336042 Merge pull request #1967 from dota17/dota17-disable
Fix C26451 warnnings in to_chars.hpp
2020-04-17 10:08:21 +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
f5a487d1b4 fix issue1982: contains() exceptions are incorrectly raised 2020-04-13 19:41:13 +08:00
b7be613b6e Merge pull request #1990 from dota17/json_pointer
catch exceptions for json_pointer : ..../+99
2020-04-13 13:29:33 +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
3483d923d4 Merge pull request #2033 from nlohmann/feature/issue1913
Replace deprecated std::is_pod
2020-04-13 12:32:37 +02:00