Commit graph

3423 commits

Author SHA1 Message Date
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 3799b3f8dd
Merge pull request #2116 from nlohmann/issue2113
Fix warnings from Clang 10 and GCC 9
2020-05-17 12:19:06 +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 28e20bd9e4
🚨 fix warnings #2113 2020-05-16 14:26: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 3ed059f6ff
revert faulty changes 2020-05-16 12:56:18 +02:00
Niels Lohmann bc1886fb60
♻️ refine interface of wrapped_binary_t 2020-05-15 23:21:49 +02:00
Niels Lohmann a452e8a0a1
💚 fix GCC 4.9 compilation 2020-05-15 22:38:18 +02:00
chenguoping ed9c205b5d add somes test cases 2020-05-15 21:48:29 +08:00
chenguoping 5dd27f1a9f compare against max float and min float before converting 2020-05-15 21:47:59 +08:00
Niels Lohmann daf2d296dd
♻️ move wrapped binary type to separate file 2020-05-15 14:12:32 +02:00
chenguoping 779a0ec7df update 2020-05-15 17:35:43 +08:00
Niels Lohmann bcf4f3ce9a
📝 add warning for items() on temporary objects #2040 2020-05-14 19:06:48 +02:00
chenguoping e175150f5b fix UBSAN 2020-05-14 20:54:47 +08:00
chenguoping 8f5b5c7469 use json_test_data version 2.0.0 2020-05-14 15:11:38 +08:00
chenguoping 47c6570470 Add some test cases about to_cbor() 2020-05-14 15:11:38 +08:00
chenguoping 44fe284f9d Enhace to_cbor() to support +/-Infinity, NaN, and single-precision float 2020-05-14 15:10:44 +08:00
Niels Lohmann 0857140839
Merge pull request #1950 from FrancoisChabot/issues/1457
templated input adapters
2020-05-14 07:52:02 +02:00
Niels Lohmann d7b032f565
add tests to improve coverage 2020-05-13 21:28:43 +02:00
Niels Lohmann a4266bbb7d
Merge branch 'develop' into issues/1457 2020-05-13 12:48:46 +02:00
Niels Lohmann a414e35971
🚨 add newline to end of file 2020-05-13 12:35:11 +02:00
Niels Lohmann 9265ca7a08
Merge pull request #2099 from nlohmann/issue2082
Add tests for binary values
2020-05-13 07:56:11 +02:00
Niels Lohmann b1c1eb145e
🔧 fix maintainer target 2020-05-12 19:36:33 +02:00
Niels Lohmann abeb80411b
📝 fix example 2020-05-12 16:28:26 +02:00
Niels Lohmann 52f5f3d29f
📝 fix example 2020-05-12 16:27:55 +02:00
Niels Lohmann e9a845f08a
📝 fix example output 2020-05-12 16:13:33 +02:00
Niels Lohmann 8e0ae9b46f
⬆️ update Doxyfile 2020-05-12 14:37:35 +02:00
Niels Lohmann afc30a14a7
🔧 set Wandbox script to use HTTPS 2020-05-12 14:37:22 +02:00
Niels Lohmann 6014419818
Merge branches 'develop' and 'issue2082' of https://github.com/nlohmann/json into issue2082 2020-05-12 12:28:34 +02:00
Niels Lohmann 1de30bc611
Merge pull request #2100 from nlohmann/fix_coveralls
Fix Coveralls integration
2020-05-12 12:26:22 +02:00
Niels Lohmann 76c01501f7
🔧 fix pedantic maintainer targets 2020-05-11 20:03:13 +02:00
Niels Lohmann 66dfa22de2
⚗️ try to fix SSL issue 2020-05-11 14:24:38 +02:00
Niels Lohmann 0ad595709d
⚗️ try to fix SSL issue 2020-05-11 13:40:43 +02:00
Niels Lohmann cbb2d4e4d8
⚗️ try to fix SSL issue 2020-05-11 13:29:40 +02:00
Niels Lohmann 8389c1961b
⚗️ try to fix SSL issue 2020-05-11 13:19:22 +02:00
Niels Lohmann 19b21e61e5
⚗️ try to fix SSL issue 2020-05-11 13:05:53 +02:00
Niels Lohmann 697305819f
⚗️ try to fix SSL issue 2020-05-11 12:37:24 +02:00
Niels Lohmann 18cbcc4135
⚗️ try to fix SSL issue 2020-05-11 12:25:41 +02:00
Niels Lohmann a3a803a389
📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann 5c42847011
add tests for binary type 2020-05-10 13:23:18 +02:00
Niels Lohmann fff46ea98c
add tests for binary type 2020-05-09 23:18:12 +02:00
Niels Lohmann 34430994bf
add tests for binary type 2020-05-09 14:16:57 +02:00
Niels Lohmann b036ace235
🐛 fix bug in binary constructor 2020-05-09 14:16:49 +02:00
Niels Lohmann 3fa94f0755
add tests for binary type 2020-05-09 13:46:24 +02:00
Niels Lohmann f0c6ab4d3b
🐛 fix bug in SAX callback parser 2020-05-08 14:21:11 +02:00
Niels Lohmann 5bfb27c865
🚨 fix some warnings 2020-05-08 12:32:28 +02:00
Niels Lohmann 8c2b26de4a
⚗️ do not include <ciso646> with C++20 #2089 2020-05-07 10:17:32 +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 cf4a6552f3
add tests for binary serialization 2020-05-06 22:24:48 +02:00