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
65e8ee985a 🔨 clean up 2020-06-22 08:59:03 +02:00
29ad2178c6 Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization
C++20 support by removing swap specialization
2020-06-21 20:39:58 +02:00
e22ce45065 🚸 improve diagnostics 2020-06-21 13:28:00 +02:00
139a0258cc Merge branch 'develop' of https://github.com/nlohmann/json into comments 2020-06-21 12:40:21 +02:00
f0e73163f2 json_pointer.hpp: Mention more exception in documentation
Forgotten in dcd3a6c6 (move the catch of std::invalid_argument into
array_index(), 2020-03-23).
2020-06-20 15:27:22 +02:00
0fe9f23254 add macros from #2175 2020-06-20 14:11:37 +02:00
b64002bbca ♻️ extract common code to function 2020-06-19 13:24:08 +02:00
0585ecc56b add tests for comment skipping 2020-06-19 13:10:35 +02:00
74520d8bb0 🚧 extend API 2020-06-17 22:03:14 +02:00
88a37010d6 🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196 2020-06-17 21:14:23 +02:00
e9bfcf7255 improve comment parsing 2020-06-17 14:59:47 +02:00
4a6c68c7eb drop new blank line 2020-06-17 20:44:31 +08:00
8aaa4013a3 remove overload function, change default_value to rvalue 2020-06-17 15:05:28 +08:00
b53c6e2f81 ignore comments 2020-06-16 12:28:59 +02:00
691fb0c57a fix issue#2059 2020-06-16 15:35:26 +08:00
5f862710fe 🔖 set version to 3.8.0 2020-06-14 17:16:45 +02:00
71830be06d fix issue#1275 2020-06-10 19:27:28 +08:00
ae04426c85 🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) 2020-06-08 20:07:15 +02:00
8c1d26e186 📝 add documentation and example for accept function 2020-06-07 20:59:43 +02:00
907803189b 🏁 fix MSVC 2015 compilation 2020-06-07 12:51:33 +02:00
225c8f150a Disable std::swap specialization in C++20 and added a friend swap function 2020-06-06 11:36:39 -04:00
bf2e714e96 🚨 fix warnings 2020-06-06 14:30:17 +02:00
7444c7fa25 Merge pull request #2145 from FrancoisChabot/1813-user-input
Fix Issue#1813: user defined input adapters
2020-06-05 14:30:39 +02:00
4350c5ed97 fix bug in issue#1972 2020-05-30 17:15:56 +08:00
b715a70673 changed macro order to satisfy clang 2020-05-28 12:26:29 -04:00
7646253940 fix inconsistent fwd declaration 2020-05-28 12:20:02 -04:00
ce3143a038 use correct deprecation macro 2020-05-28 12:16:10 -04:00
d575534471 brought back the from_*(ptr, len) syntax with a deprecation warning 2020-05-28 12:13:43 -04:00
897061c434 amalgamate 2020-05-28 10:11:19 -04:00
61832afe15 Merge pull request #2144 from XyFreak/gcc10_type_limits
Fix issue#1939: Cast character to unsigned for comparison
2020-05-28 12:59:57 +02:00
a4f1cf4d00 better parse documentation 2020-05-28 02:50:58 -04:00
76b49f9ee6 misc formatting fixes 2020-05-28 02:29:53 -04:00
9ec0e4c25b Merge pull request #2140 from nlohmann/issue1715
Respect allow_exceptions=false for binary formats
2020-05-28 07:52:26 +02:00
377995f495 forcefully exclude arrays from being interpreted as pointers 2020-05-27 18:21:38 -04:00
b9416a26aa correct ADL lookup of arrays on Mac and Windows 2020-05-27 13:21:23 -04:00
f1969e60a3 reamalgamate 2020-05-27 12:56:26 -04:00
5684d9a498 unified input API 2020-05-27 12:40:04 -04:00
23051df2c7 Cast character to unsigned for comparison 2020-05-27 13:15:31 +02:00
d70d06ae41 Merge pull request #2137 from dota17/MSC_VER
Fix issue 2112
2020-05-27 08:49:19 +02:00
3c60a66c4c Merge pull request #2104 from dota17/issue#2086
Fix issue#2086: disallow json::value_t type parameter in value()
2020-05-26 13:15:06 +02:00
eb50fbf926 fix issue 2112 2020-05-26 16:43:16 +08:00
c92a696852 📝 update documentation 2020-05-22 18:21:37 +02:00
88292d9499 🚨 remove redundant assertions 2020-05-22 14:19:07 +02:00
225fa58f16 🚧 add fix from #1715 2020-05-20 22:20:40 +02:00
a82c80e9af Merge pull request #2125 from nlohmann/binary_type
Clean up implementation of binary type
2020-05-20 18:58:29 +02:00
21b1680ea1 🚚 rename binary_array() to binary() 2020-05-19 13:30:22 +02:00
952a87a4f4 🚚 move byte container outside detail namespace 2020-05-19 13:08:18 +02:00
b7ff40029a 💥 change serialization of binary values 2020-05-18 13:53:20 +02:00
3f0cf26f7a changes to the single header were applied 2020-05-18 10:17:45 +00:00
904642f261 ♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00