gatopeich
|
15337b2cc3
|
Ignore allocator hardcoded to match std::map
|
2020-06-22 00:03:48 +01:00 |
|
gatopeich
|
27aaf6f845
|
Clean-up ordered_map declarations
|
2020-06-21 22:28:03 +01:00 |
|
Niels Lohmann
|
6ee9e5f402
|
⚗️ remove const from value type
|
2020-06-20 13:23:44 +02:00 |
|
Niels Lohmann
|
4fd0d02b6f
|
🚧 toward an ordered_json type
|
2020-06-19 15:27:05 +02:00 |
|
Niels Lohmann
|
5f862710fe
|
🔖 set version to 3.8.0
|
2020-06-14 17:16:45 +02:00 |
|
Niels Lohmann
|
ae04426c85
|
🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532)
|
2020-06-08 20:07:15 +02:00 |
|
Niels Lohmann
|
8c1d26e186
|
📝 add documentation and example for accept function
|
2020-06-07 20:59:43 +02:00 |
|
Niels Lohmann
|
907803189b
|
🏁 fix MSVC 2015 compilation
|
2020-06-07 12:51:33 +02:00 |
|
Niels Lohmann
|
bf2e714e96
|
🚨 fix warnings
|
2020-06-06 14:30:17 +02:00 |
|
Niels Lohmann
|
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 |
|
chenguoping
|
4350c5ed97
|
fix bug in issue#1972
|
2020-05-30 17:15:56 +08:00 |
|
Francois Chabot
|
b715a70673
|
changed macro order to satisfy clang
|
2020-05-28 12:26:29 -04:00 |
|
Francois Chabot
|
7646253940
|
fix inconsistent fwd declaration
|
2020-05-28 12:20:02 -04:00 |
|
Francois Chabot
|
ce3143a038
|
use correct deprecation macro
|
2020-05-28 12:16:10 -04:00 |
|
Francois Chabot
|
d575534471
|
brought back the from_*(ptr, len) syntax with a deprecation warning
|
2020-05-28 12:13:43 -04:00 |
|
Francois Chabot
|
897061c434
|
amalgamate
|
2020-05-28 10:11:19 -04:00 |
|
Niels Lohmann
|
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 |
|
Francois Chabot
|
a4f1cf4d00
|
better parse documentation
|
2020-05-28 02:50:58 -04:00 |
|
Francois Chabot
|
76b49f9ee6
|
misc formatting fixes
|
2020-05-28 02:29:53 -04:00 |
|
Niels Lohmann
|
9ec0e4c25b
|
Merge pull request #2140 from nlohmann/issue1715
Respect allow_exceptions=false for binary formats
|
2020-05-28 07:52:26 +02:00 |
|
Francois Chabot
|
377995f495
|
forcefully exclude arrays from being interpreted as pointers
|
2020-05-27 18:21:38 -04:00 |
|
Francois Chabot
|
b9416a26aa
|
correct ADL lookup of arrays on Mac and Windows
|
2020-05-27 13:21:23 -04:00 |
|
Francois Chabot
|
f1969e60a3
|
reamalgamate
|
2020-05-27 12:56:26 -04:00 |
|
Francois Chabot
|
5684d9a498
|
unified input API
|
2020-05-27 12:40:04 -04:00 |
|
Tobias Kux
|
23051df2c7
|
Cast character to unsigned for comparison
|
2020-05-27 13:15:31 +02:00 |
|
Niels Lohmann
|
d70d06ae41
|
Merge pull request #2137 from dota17/MSC_VER
Fix issue 2112
|
2020-05-27 08:49:19 +02:00 |
|
Niels Lohmann
|
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 |
|
chenguoping
|
eb50fbf926
|
fix issue 2112
|
2020-05-26 16:43:16 +08:00 |
|
Niels Lohmann
|
c92a696852
|
📝 update documentation
|
2020-05-22 18:21:37 +02:00 |
|
Niels Lohmann
|
88292d9499
|
🚨 remove redundant assertions
|
2020-05-22 14:19:07 +02:00 |
|
Niels Lohmann
|
225fa58f16
|
🚧 add fix from #1715
|
2020-05-20 22:20:40 +02:00 |
|
Niels Lohmann
|
a82c80e9af
|
Merge pull request #2125 from nlohmann/binary_type
Clean up implementation of binary type
|
2020-05-20 18:58:29 +02:00 |
|
Niels Lohmann
|
21b1680ea1
|
🚚 rename binary_array() to binary()
|
2020-05-19 13:30:22 +02:00 |
|
Niels Lohmann
|
952a87a4f4
|
🚚 move byte container outside detail namespace
|
2020-05-19 13:08:18 +02:00 |
|
Niels Lohmann
|
b7ff40029a
|
💥 change serialization of binary values
|
2020-05-18 13:53:20 +02:00 |
|
gistrec
|
3f0cf26f7a
|
changes to the single header were applied
|
2020-05-18 10:17:45 +00:00 |
|
Niels Lohmann
|
904642f261
|
♻️ rename internal_binary_t with binary_t
|
2020-05-17 22:50:27 +02:00 |
|
Niels Lohmann
|
dead99eb0e
|
🔨 overwork binary subtypes
|
2020-05-17 13:51:59 +02:00 |
|
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
|
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 |
|