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
|
248f310215
|
cleaned up custom iterator example
|
2020-05-28 10:14:55 -04:00 |
|
Francois Chabot
|
897061c434
|
amalgamate
|
2020-05-28 10:11:19 -04:00 |
|
Francois Chabot
|
7ceb06baac
|
Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input
|
2020-05-28 09:30:07 -04:00 |
|
Francois Chabot
|
dcf6175978
|
use the correct convention for boolean operators
|
2020-05-28 09:29:38 -04:00 |
|
Niels Lohmann
|
23c8ab95da
|
👥 update contributor list
|
2020-05-28 14:24:08 +02:00 |
|
Niels Lohmann
|
53ef076715
|
🔧 add more warning flags from GCC 10
|
2020-05-28 13:46:56 +02:00 |
|
Niels Lohmann
|
2edb5cb999
|
👷 fix -DJSON_BuildTests=On parameter placement
|
2020-05-28 13:46:47 +02: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 |
|
Niels Lohmann
|
5ff4d7b7ff
|
Merge branch 'develop' of https://github.com/nlohmann/json into develop
|
2020-05-28 12:54:13 +02:00 |
|
Niels Lohmann
|
fcda998ee2
|
🔧 add more warning flags from GCC 10
|
2020-05-28 12:53:22 +02:00 |
|
Francois Chabot
|
d3caf93ab0
|
Merge branch 'develop' into 1813-user-input
|
2020-05-28 03:40:34 -04:00 |
|
Francois Chabot
|
bfcd32c099
|
removed clang-format
|
2020-05-28 03:16:24 -04:00 |
|
Francois Chabot
|
3a91a05db6
|
added custom input to readme
|
2020-05-28 03:13:39 -04: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 |
|
Niels Lohmann
|
a01759af0f
|
Merge pull request #2143 from quentin-dev/develop
Fix issue#2142: readme: fix typo in CMake FetchContent example
|
2020-05-28 07:50:27 +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 |
|
Quentin Barbarat
|
e44418ea26
|
readme: fix typo in CMake FetchContent example
|
2020-05-27 13:51:13 +02:00 |
|
Niels Lohmann
|
bb9619ef8b
|
📝 request more details in question template
|
2020-05-27 13:22:34 +02:00 |
|
Niels Lohmann
|
325e8ab8ab
|
🔧 explicitly switch on tests in CI
|
2020-05-27 13:22:14 +02:00 |
|
Tobias Kux
|
23051df2c7
|
Cast character to unsigned for comparison
|
2020-05-27 13:15:31 +02:00 |
|
Niels Lohmann
|
ed5c28d00c
|
👥 update contributor list
|
2020-05-27 13:07:24 +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
|
e3d9b3d755
|
📝 add documentation of parser callbacks
|
2020-05-26 14:16:13 +02:00 |
|
Niels Lohmann
|
ace594da6a
|
Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs
|
2020-05-26 13:17:55 +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 |
|
Niels Lohmann
|
27fe50dc92
|
📝 add example for contains #2133
Closes #2133.
|
2020-05-26 12:46:04 +02:00 |
|
Niels Lohmann
|
25aab7ee41
|
Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge
Add bleeding edge GCC to CI
|
2020-05-26 12:39:42 +02:00 |
|
chenguoping
|
eb50fbf926
|
fix issue 2112
|
2020-05-26 16:43:16 +08:00 |
|
Antony Kellermann
|
49000cd77d
|
Update documentation to reflect addition of Arch Linux CI testing.
|
2020-05-25 20:46:39 -04:00 |
|
Antony Kellermann
|
5a72cfa0c3
|
Add base and base-devel to list of arch linux programs to install.
|
2020-05-25 20:43:15 -04:00 |
|
Antony Kellermann
|
1d57ddd2d4
|
Add -y flag to pacman to sync repos.
|
2020-05-25 20:24:54 -04:00 |
|
Antony Kellermann
|
41a84b1202
|
Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently.
|
2020-05-25 20:17:02 -04:00 |
|
Antony Kellermann
|
eff2f51071
|
Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image.
|
2020-05-25 20:14:49 -04:00 |
|
Antony Kellermann
|
bf4a090075
|
Rename build job to build_stable to be more descriptive.
|
2020-05-25 20:12:54 -04:00 |
|
Niels Lohmann
|
413df0fd88
|
📝 add more content to iterator page
|
2020-05-25 14:03:11 +02:00 |
|
Niels Lohmann
|
95a3c76643
|
📝 make examples collapsible
|
2020-05-24 22:45:38 +02:00 |
|
Niels Lohmann
|
ddf92606ab
|
📝 add PlantUML
|
2020-05-24 21:05:35 +02:00 |
|
Niels Lohmann
|
3400af21cd
|
📝 add release page
|
2020-05-24 13:40:43 +02:00 |
|
Niels Lohmann
|
a8f0cd15df
|
📝 add mkdocs
|
2020-05-24 13:03:04 +02: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 |
|