Commit Graph

Select branches

Hide Pull Requests

bon8

clang-format

coverity_scan

develop

feature/optional

gh-pages

issue2228

issue2615

master

update_doctest_2.4.9

#1001

#1004

#1004

#1005

#1005

#1006

#1009

#1024

#1024

#1026

#1028

#104

#104

#1040

#1041

#1043

#1047

#1048

#105

#105

#1058

#1067

#1067

#1069

#1069

#1077

#1077

#1078

#1089

#111

#111

#1117

#1121

#1121

#1124

#1124

#1125

#1125

#1126

#1126

#1128

#1128

#1130

#1134

#1138

#1142

#1144

#115

#1150

#1150

#1151

#1153

#1156

#1156

#116

#116

#1176

#1187

#119

#119

#120

#1200

#1202

#121

#1210

#1210

#1214

#122

#1221

#1222

#1222

#1228

#123

#123

#1230

#1231

#1234

#1234

#1238

#124

#1245

#1249

#1251

#1252

#1254

#1257

#126

#1260

#1262

#1265

#1266

#1266

#1269

#1269

#1270

#1271

#1272

#1277

#1280

#1282

#129

#1294

#130

#1301

#1302

#1302

#1303

#1305

#1307

#1307

#131

#1313

#1314

#1315

#1317

#1320

#1322

#1323

#1326

#1329

#1330

#1342

#1343

#1345

#1346

#1357

#1363

#137

#1376

#1378

#1380

#1382

#1389

#139

#1391

#1392

#1396

#14

#140

#140

#1409

#141

#141

#1411

#1413

#1414

#1417

#1420

#1423

#1425

#1428

#1430

#1431

#1434

#1435

#1436

#1439

#1440

#1441

#1443

#1446

#1451

#1452

#1454

#1455

#146

#1464

#1468

#1469

#1474

#1477

#1488

#1489

#1491

#1492

#1495

#1496

#1514

#1517

#1522

#1523

#1524

#153

#155

#155

#1551

#1555

#1559

#1565

#1570

#1585

#1588

#1598

#1606

#1618

#1625

#1635

#1639

#1643

#165

#165

#1660

#1662

#1670

#1673

#1687

#1688

#1689

#169

#169

#1690

#1694

#170

#170

#1701

#1722

#1724

#1728

#1741

#1744

#1746

#1760

#1765

#1767

#1769

#1779

#1780

#1785

#1797

#1799

#18

#1801

#1803

#1804

#1806

#1810

#182

#1821

#1826

#183

#183

#1830

#1838

#184

#1844

#1846

#1853

#1857

#1871

#1872

#1876

#188

#1884

#189

#1899

#19

#190

#1900

#1907

#1909

#191

#1917

#1918

#1923

#193

#1933

#1940

#1950

#1956

#1958

#196

#1967

#1969

#197

#1974

#1979

#198

#198

#1980

#1984

#1990

#1991

#1992

#1993

#1994

#1995

#200

#2002

#2004

#2008

#201

#201

#2010

#2011

#2019

#2025

#2033

#2034

#2038

#2043

#2044

#205

#2050

#2051

#2053

#2054

#206

#206

#2060

#2069

#207

#2071

#2074

#2076

#2077

#208

#2080

#2081

#209

#209

#2099

#21

#2100

#2104

#2115

#2116

#2117

#2117

#2119

#212

#212

#2121

#2123

#2125

#213

#2136

#2137

#2140

#2143

#2144

#2145

#215

#215

#2152

#2153

#2158

#2160

#2164

#2165

#2173

#2174

#2176

#2178

#218

#2181

#2182

#2183

#2193

#22

#2201

#2202

#2203

#2206

#2211

#2212

#2213

#222

#2222

#2224

#2225

#2229

#2229

#2232

#2233

#2237

#2241

#2242

#2244

#2245

#2251

#2253

#2255

#2257

#2258

#2259

#226

#2262

#2263

#2264

#2268

#2269

#227

#2273

#2274

#2279

#2282

#2283

#2285

#2287

#2288

#2288

#2294

#2297

#2299

#23

#2300

#2301

#2303

#2305

#2306

#2308

#2312

#2314

#2318

#2319

#232

#2320

#2327

#2332

#2333

#2336

#234

#234

#2344

#2347

#2349

#2352

#2354

#2357

#2363

#2364

#2367

#2375

#238

#24

#240

#240

#2405

#2406

#2411

#2414

#2415

#2417

#2418

#242

#2444

#2447

#247

#2477

#2483

#2512

#2514

#2525

#2532

#2533

#2534

#2536

#2537

#2538

#2540

#2545

#2547

#2550

#2553

#2558

#2558

#2560

#2561

#2562

#2576

#2582

#26

#2607

#2616

#2624

#2625

#2637

#2659

#266

#2673

#2677

#2679

#2683

#2685

#2687

#2688

#2688

#2689

#2690

#2693

#2693

#2707

#271

#2729

#2731

#2736

#2737

#2738

#2747

#2749

#275

#2753

#2754

#2756

#2762

#2770

#2771

#2789

#279

#2790

#2795

#2807

#2817

#2818

#2818

#2819

#2825

#2826

#2843

#2843

#2861

#2866

#2872

#2873

#2874

#2875

#2879

#2880

#2885

#2889

#2898

#29

#29

#2902

#2908

#2911

#2925

#2927

#2930

#2931

#2936

#2940

#2943

#2945

#2947

#2948

#2950

#2952

#2954

#2956

#2957

#2959

#2960

#2961

#2963

#2966

#2967

#2968

#2974

#2976

#2981

#2986

#2989

#2998

#2998

#300

#3008

#3014

#3019

#3020

#3028

#3037

#3040

#3041

#3041

#3069

#3071

#3073

#3079

#3082

#3088

#3100

#3101

#3102

#3109

#3110

#3121

#3122

#3125

#313

#3140

#3143

#3145

#3148

#3164

#3165

#3165

#318

#3181

#3193

#3194

#3199

#320

#320

#321

#3222

#3225

#3226

#3227

#3228

#3229

#3233

#3234

#3236

#3237

#324

#3240

#3244

#3246

#3247

#3248

#3249

#3265

#327

#327

#3289

#3295

#33

#3320

#3326

#3332

#3336

#3338

#334

#334

#3351

#336

#3368

#337

#337

#3370

#3375

#3378

#3379

#338

#338

#3380

#3382

#3385

#3385

#3393

#34

#34

#3405

#3415

#3416

#3417

#3418

#3420

#3421

#3422

#3423

#3426

#3427

#3431

#3437

#3439

#3440

#3440

#3442

#3442

#3444

#3446

#3450

#3450

#3451

#3452

#3454

#3456

#3462

#3463

#3464

#3465

#3466

#3478

#3479

#3481

#3485

#3487

#3493

#3498

#3499

#35

#35

#3500

#3502

#3505

#3514

#3516

#3517

#3518

#3518

#3520

#3521

#3523

#3528

#3529

#3530

#3531

#3532

#3534

#3536

#3543

#3544

#3545

#3545

#3546

#3548

#355

#355

#3550

#3553

#3554

#3554

#3555

#3557

#3564

#3565

#3569

#3571

#3572

#3575

#3575

#3577

#3577

#3580

#3581

#3585

#3586

#3590

#3592

#3593

#3596

#3599

#36

#3601

#3604

#3605

#3609

#3610

#3614

#3615

#3618

#3619

#3621

#3622

#3626

#3628

#3629

#3630

#3631

#3633

#3634

#3635

#3636

#3637

#3638

#3642

#3642

#3643

#3646

#3651

#3658

#3660

#3661

#3662

#3663

#3664

#3667

#3670

#3671

#3672

#3673

#3674

#3675

#3676

#3677

#3678

#3679

#3680

#3681

#3683

#3684

#3685

#3686

#3687

#3688

#3690

#3692

#3693

#3694

#3695

#3697

#3698

#3702

#3703

#3709

#3718

#3719

#3723

#3724

#3725

#3725

#3726

#3728

#3738

#3739

#3740

#3743

#3748

#3749

#3749

#3751

#3759

#3759

#3762

#3762

#3765

#3765

#3767

#378

#3781

#379

#379

#3790

#38

#3809

#3814

#3816

#3822

#3841

#3841

#3845

#3862

#3863

#3872

#3876

#3887

#3888

#3889

#3891

#3892

#3895

#3898

#3898

#3899

#3899

#390

#3901

#3906

#391

#3920

#3929

#3929

#3932

#3933

#3934

#3937

#395

#3950

#3951

#3964

#3965

#3966

#3969

#3972

#3975

#3978

#3981

#3985

#3988

#3996

#40

#400

#4009

#4010

#4015

#4015

#4024

#4032

#4033

#4033

#4035

#4035

#4036

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4056

#4057

#4057

#4059

#4073

#4078

#4080

#4082

#4082

#4083

#4085

#4092

#4092

#4099

#41

#41

#410

#4108

#4109

#4111

#4112

#4115

#4126

#4137

#4137

#4138

#4140

#4143

#4149

#415

#4153

#4159

#4160

#4161

#4166

#4167

#4167

#4169

#4170

#4173

#4175

#4176

#4177

#4179

#4180

#4181

#4181

#4182

#4189

#4194

#4196

#4203

#4210

#4210

#4214

#4214

#4215

#4216

#4217

#4218

#4219

#4222

#4226

#4226

#423

#423

#4230

#4231

#4232

#4233

#4233

#4237

#4255

#4255

#426

#426

#4262

#4262

#4265

#4266

#4269

#4273

#4274

#4276

#4277

#4286

#4288

#430

#435

#439

#441

#441

#450

#461

#496

#5

#508

#510

#526

#530

#532

#532

#533

#533

#534

#535

#535

#536

#540

#545

#555

#555

#560

#560

#576

#578

#579

#583

#588

#59

#594

#594

#595

#598

#6

#609

#615

#619

#619

#624

#626

#629

#63

#630

#643

#650

#652

#654

#663

#666

#669

#671

#674

#678

#679

#682

#685

#686

#687

#687

#69

#696

#696

#697

#697

#699

#699

#700

#706

#706

#708

#71

#710

#710

#72

#73

#74

#74

#749

#749

#75

#75

#753

#764

#765

#783

#785

#788

#79

#79

#793

#795

#798

#798

#807

#81

#811

#819

#819

#822

#822

#823

#823

#829

#844

#848

#848

#85

#854

#855

#856

#858

#86

#860

#862

#862

#866

#866

#868

#87

#870

#873

#875

#876

#879

#88

#88

#880

#882

#885

#890

#890

#900

#911

#915

#918

#918

#919

#922

#922

#925

#930

#936

#940

#944

#950

#954

#955

#957

#969

#978

#978

#981

#984

#984

#986

#988

#988

#989

#989

#991

#991

#992

2.0.10

2.0.8

2.0.9

2.1.0

2.1.1

3.0.0

3.0.1

3.1.0

3.1.2

3.2.0

3.3.0

3.6.1

v1.0.0

v1.0.0-rc1

v1.1.0

v2.0.0

v2.0.1

v2.0.10

v2.0.2

v2.0.3

v2.0.4

v2.0.5

v2.0.6

v2.0.7

v2.0.8

v2.0.9

v2.1.0

v2.1.1

v3.0.0

v3.0.1

v3.1.0

v3.1.1

v3.1.2

v3.10.0

v3.10.1

v3.10.2

v3.10.3

v3.10.4

v3.10.5

v3.11.0

v3.11.1

v3.11.2

v3.11.3

v3.2.0

v3.3.0

v3.4.0

v3.5.0

v3.6.0

v3.6.1

v3.7.0

v3.7.1

v3.7.2

v3.7.3

v3.8.0

v3.9.0

v3.9.1

Mono Color

• c3df4ffd5a
  🚨 fix warning Niels Lohmann 2021-08-01 14:08:14 +0200
• 5a1bc76f34
  ⚗️ switch off exceptions Niels Lohmann 2021-08-01 13:34:55 +0200
• e7260f07f5
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 Niels Lohmann 2021-08-01 13:07:43 +0200
• a54403290e
  📄 add CITATION file Niels Lohmann 2021-08-01 12:42:59 +0200
• 9ed027ac10
  Merge pull request #2902 from nlohmann/issue2893 Niels Lohmann 2021-07-31 20:42:55 +0200
• 8676f6745e
  ✅ add regression test #2824 Niels Lohmann 2021-07-30 21:18:25 +0200
• f4716a0d42
  🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 21:12:55 +0200
• 9a459e1bd5
  🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 15:20:22 +0200
• c7822840eb
  ✅ add regression test #2824 Niels Lohmann 2021-07-30 15:00:54 +0200
• 7feb2c20cf
  🚨 fix useless-cast warnings Niels Lohmann 2021-07-30 14:48:25 +0200
• 2c030bac2c
  ✅ add regression test #2824 Niels Lohmann 2021-07-30 14:41:06 +0200
• 1c030cccf1
  ✅ add regression test #2824 Niels Lohmann 2021-07-29 15:23:21 +0200
• 5f39b09cbc
  ⏪ undo experimental fix for Clang 3.5 Niels Lohmann 2021-07-23 10:05:22 +0200
• 86dd66508d
  ⚗️ add fix for Clang 3.5 Niels Lohmann 2021-07-22 14:21:43 +0200
• 3212700eb0
  👌 fix code according to review comments Niels Lohmann 2021-07-22 13:24:23 +0200
• 1bd8a10225
  👌 fix code according to review comments Niels Lohmann 2021-07-22 12:38:48 +0200
• a563338039
  Merge pull request #2825 from ldionne/ldionne-lazy Niels Lohmann 2021-07-22 12:24:56 +0200
• 575c28ca4c
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-07-22 09:29:17 +0200
• 19a5e12136
  CMake cleanup (#2885) Niels Lohmann 2021-07-22 09:25:55 +0200
• 37b3c3de35
  Merge branch 'develop' of https://github.com/nlohmann/json into cmake_cleanup Niels Lohmann 2021-07-21 21:17:59 +0200
• eba82ecd62
  Refactor Unicode tests (#2889) Niels Lohmann 2021-07-21 21:17:01 +0200
• 02ca814e6c
  🔨 fix typo Niels Lohmann 2021-07-21 19:43:02 +0200
• 8147a95e5c
  ⏪ revert experiments Niels Lohmann 2021-07-21 19:42:51 +0200
• c05be30e8c
  🔨 fix numbers Niels Lohmann 2021-07-21 19:33:36 +0200
• eecd5a7de6
  ♻️ split Unicode tests Niels Lohmann 2021-07-21 15:38:08 +0200
• 9519580489
  ♻️ split Unicode tests Niels Lohmann 2021-07-21 14:45:34 +0200
• 887a35c05d
  ♻️ split Unicode tests Niels Lohmann 2021-07-21 14:03:38 +0200
• db0287d2ef trigger upstream CI Chaoya Li 2021-07-21 08:43:45 +0800
• dea6ae0b7d
  ⚗️ remove test Niels Lohmann 2021-07-20 15:43:16 +0200
• 28647dbfad
  ⚗️ set timeout Niels Lohmann 2021-07-20 15:21:51 +0200
• 4b437e29af
  ⚗️ try disabling concurrency Niels Lohmann 2021-07-20 14:45:11 +0200
• b7b617f0c0
  ⚗️ try disabling concurrency Niels Lohmann 2021-07-20 13:55:05 +0200
• 18874a9873
  ⚗️ try rerunning tests Niels Lohmann 2021-07-20 07:55:29 +0200
• d4a6c17bf1
  💡 update documentation Niels Lohmann 2021-07-19 20:39:16 +0200
• 8840c3dd89
  🔥 clean CMake files and Makefile Niels Lohmann 2021-07-19 20:39:03 +0200
• b0e5965d71 Properly constrain the basic_json conversion operator Louis Dionne 2021-06-17 13:17:43 -0400
• 03270ef090
  👥 update contributors Niels Lohmann 2021-07-19 16:57:15 +0200
• 45016c4429
  ⬆️ update Doxyfile Niels Lohmann 2021-07-19 16:56:43 +0200
• 7066ab128f
  🎨 reindent code Niels Lohmann 2021-07-19 16:56:28 +0200
• 926fab47d0
  📝 fix GIF examples #2457 Niels Lohmann 2021-07-17 14:43:01 +0200
• a0863b8c20
  📝 add support section Niels Lohmann 2021-07-17 13:44:54 +0200
• 517aeec299
  Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2021-07-17 12:39:45 +0200
• 8f0a880c89
  Merge pull request #2879 from nlohmann/issue2598 Niels Lohmann 2021-07-17 12:38:33 +0200
• 3db8903f29
  📝 restructure README Niels Lohmann 2021-07-16 15:00:11 +0200
• fb1ee4f94b
  📝 update documentation Niels Lohmann 2021-07-16 14:41:14 +0200
• 835749efcc
  ✅ add test for JSON_SystemInclude flag Niels Lohmann 2021-07-16 12:34:15 +0200
• fb31616a61
  Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2021-07-16 12:27:53 +0200
• b2d21067d1
  Merge pull request #2762 from jpl-mac/no.tidy.warnings.dev Niels Lohmann 2021-07-16 12:06:26 +0200
• c65369acbe
  👷 fix Codacity badge Niels Lohmann 2021-07-16 11:44:07 +0200
• f907f9502d
  Merge pull request #2875 from nlohmann/issue2592 Niels Lohmann 2021-07-16 10:11:29 +0200
• 6732c3d986
  ⚗️ use GCC static analyzer Niels Lohmann 2021-07-16 09:59:28 +0200
• b7cc47089f
  ⚡ avoid string in case of empty objects Niels Lohmann 2021-07-16 09:27:18 +0200
• 8ba8c43707
  Merge branch 'develop' of https://github.com/nlohmann/json into string_view Niels Lohmann 2021-07-16 08:45:53 +0200
• 80cb607e8c
  🚧 fix return type Niels Lohmann 2021-07-16 08:08:26 +0200
• c89e23c69b
  Merge pull request #2874 from nlohmann/issue2572 Niels Lohmann 2021-07-16 07:54:48 +0200
• f883ddd1c2
  Merge pull request #2872 from nlohmann/issue2865 Niels Lohmann 2021-07-16 06:52:28 +0200
• 92ec35735c
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2592 Niels Lohmann 2021-07-15 22:28:03 +0200
• 953dcfb611
  🚨 fix warning #2572 Niels Lohmann 2021-07-15 22:00:16 +0200
• 996ac1c017
  Merge branch 'develop' of https://github.com/nlohmann/json into issue2572 Niels Lohmann 2021-07-15 21:57:52 +0200
• 3e4723a49f
  🔨 remove noexcept annotation Niels Lohmann 2021-07-15 21:49:09 +0200
• ecaac22656
  💡 add comment to describe j.m_value.destroy(j.m_type) calls Niels Lohmann 2021-07-15 20:34:50 +0200
• f6863e062c
  🐛 fix leak for all types Niels Lohmann 2021-07-15 20:32:37 +0200
• 9d6d87dd53
  Add needed #include for value_t Martin Ross 2021-07-15 10:57:33 -0400
• 0011cd1b72
  🐛 fix leak for strings Niels Lohmann 2021-07-15 13:12:21 +0200
• 0f8666ecdc
  🐛 fix leak for strings Niels Lohmann 2021-07-15 13:03:20 +0200
• c1298e69a6
  🐛 fix leak for strings Niels Lohmann 2021-07-15 12:52:17 +0200
• 6cbdc83994
  🐛 fix leak for strings Niels Lohmann 2021-07-15 12:47:15 +0200
• 149ded856f
  ♻️ simplify destroy() function for primitive types Niels Lohmann 2021-07-15 12:46:48 +0200
• db98073930
  ✅ add regression test Niels Lohmann 2021-07-15 09:02:24 +0200
• c9c5c016a2
  Merge pull request #2866 from nlohmann/issue2838 Niels Lohmann 2021-07-14 12:04:37 +0200
• 4e92a61784
  Merge pull request #2795 from turintech/develop Niels Lohmann 2021-07-13 16:58:25 +0200
• a711e1f5a7
  🚨 fix warnings Niels Lohmann 2021-07-13 15:37:57 +0200
• 3bb9467073
  ♻️ move capacity check to set_parent function Niels Lohmann 2021-07-13 15:27:27 +0200
• bc7e8faa4f
  🔥 remove duplicated line Niels Lohmann 2021-07-12 19:21:07 +0200
• b0730f29cf
  🐛 fix logics Niels Lohmann 2021-07-12 15:24:06 +0200
• d40e98ecef
  🐛 fix assertion failure #2838 Niels Lohmann 2021-07-12 13:38:28 +0200
• 9426074ce8
  Merge pull request #2861 from nlohmann/documentation Niels Lohmann 2021-07-11 14:15:41 +0200
• 249688037f
  ⚗️ fix coverage Niels Lohmann 2021-07-11 09:33:43 +0200
• 7442c24662
  🚨 suppress missingReturn warnings Niels Lohmann 2021-07-10 13:44:13 +0200
• a82f66beed
  📝 document JSON_NO_IO macro #2842 Niels Lohmann 2021-07-10 12:51:18 +0200
• 5c8d0af5ce
  📝 add comment for handling of negative zeros #2854 Niels Lohmann 2021-07-10 12:50:59 +0200
• 098bbab029
  Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2021-07-06 08:46:51 +0200
• 71fd9bd954
  📝 fix documentation (#2845) Niels Lohmann 2021-07-06 08:46:17 +0200
• 98ac25b2ce Add const to getters for macro tests Chaoya Li 2021-06-28 21:02:29 +0800
• f452a92c07 Added test for serialization of default constructed object Chaoya Li 2021-06-28 18:35:02 +0800
• 35c37c8ab5 Renamed default_obj in to avoid name clashes Chaoya Li 2021-06-28 18:06:46 +0800
• d8ba9f43b0 Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT Chaoya Li 2021-06-28 18:02:14 +0800
• b7e493e98a Specified git branch for google benchmark fetch Rafail Giavrimis 2021-06-01 13:17:53 +0100
• 6471a63115
  Merge pull request #2729 from theShmoo/without-io Niels Lohmann 2021-06-26 12:50:06 +0200
• 5664233fe4 Rephrased docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT Chaoya Li 2021-06-26 05:57:45 +0800
• 5a5832e178 Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT accordingly Chaoya Li 2021-06-25 19:45:01 +0800
• 7aeda9d433 Reverted changes for NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE; added new macros NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT Chaoya Li 2021-06-22 09:00:11 +0800
• 624f59eacb
  Merge pull request #2826 from justanotheranonymoususer/patch-1 Niels Lohmann 2021-06-21 14:48:39 +0200
• e970f31066
  Update arbitrary_types.md justanotheranonymoususer 2021-06-18 12:44:27 +0300
• c3d7fcb76c
  Update README.md justanotheranonymoususer 2021-06-18 11:04:53 +0300
• 9710108d6a
  Consistency with using in README.md justanotheranonymoususer 2021-06-17 21:39:29 +0300
• ae9cfb17bd
  CI: add -mbig-obj compilation option for MinGW build Alexey Ochapov 2021-06-17 21:29:04 +0300
• 4611528bb8
  guard instantiation of detail::detector in conversion operator of basic_json Alexey Ochapov 2021-02-06 12:54:20 +0300
• d2852ea0c1
  add test for enum and ordered_json Alexey Ochapov 2021-02-05 20:09:38 +0300
• 572343be63 Merge branch 'nlohmann:develop' into without-io David Pfahler 2021-06-15 12:24:19 +0200