Fix Issue#1813: user defined input adapters - #2145

Merged

nlohmann merged 18 commits into

nlohmann:developfrom

FrancoisChabot:1813-user-input

Jun 5, 2020

Commits on May 27, 2020

Commits on May 28, 2020

misc formatting fixes
Francois-air
committed
76b49f9
better parse documentation
Francois-air
committed
a4f1cf4
added custom input to readme
Francois-air
committed
3a91a05
removed clang-format
Francois-air
committed
bfcd32c
Merge branch 'develop' into 1813-user-input
FrancoisChabot
authored
d3caf93
use the correct convention for boolean operators
Francois-air
committed
dcf6175
Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input
Francois-air
committed
7ceb06b
amalgamate
Francois-air
committed
897061c
cleaned up custom iterator example
Francois-air
committed
248f310
brought back the from_*(ptr, len) syntax with a deprecation warning
Francois-air
committed
d575534
use correct deprecation macro
Francois-air
committed
ce3143a
fix inconsistent fwd declaration
Francois-air
committed
7646253
changed macro order to satisfy clang
Francois-air
committed
b715a70
minor readme correction
Francois-air
committed
0da131d