Commit Graph - json - Gitea: Git with a cup of tea

amorfo77/json

Fork 0

mirror of https://github.com/nlohmann/json.git synced 2026-06-08 05:39:44 +00:00

Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

bson-sizes

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/actions/checkout-6.0.3

dependabot/pip/docs/mkdocs/mkdocs-git-revision-date-localized-plugin-1.5.3

develop

feature/optional

fix-indent_string-resize

gh-pages

issue2228

issue2615

issue3989

issue4440

issue4552-ignore

issue4755-cppcheck-warning

master

nvcc-image

remove-if

#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

#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

#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

#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

#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

#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

#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

#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

#3751

#3759

#3759

#3762

#3762

#3765

#3765

#3767

#378

#3781

#379

#379

#3790

#38

#3809

#3814

#3816

#3822

#3841

#3845

#3862

#3863

#3872

#3876

#3887

#3888

#3889

#3891

#3892

#3895

#3898

#3898

#3899

#3899

#390

#3901

#3906

#391

#3920

#3929

#3932

#3933

#3934

#3937

#395

#3950

#3951

#3964

#3965

#3966

#3969

#3972

#3975

#3978

#3981

#3985

#3988

#3996

#40

#400

#4009

#4010

#4015

#4024

#4032

#4033

#4035

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4057

#4059

#4073

#4078

#4080

#4082

#4082

#4083

#4085

#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

#4214

#4215

#4216

#4217

#4218

#4219

#4222

#4226

#423

#423

#4230

#4231

#4232

#4233

#4237

#4255

#426

#426

#4262

#4265

#4266

#4269

#4273

#4274

#4276

#4277

#4286

#4288

#430

#4310

#4311

#4314

#4323

#4324

#4331

#4333

#4335

#4342

#4343

#4344

#4345

#4346

#435

#4353

#4356

#4356

#4362

#4364

#4365

#4366

#4368

#4372

#4375

#4380

#4385

#439

#4390

#4391

#4393

#4396

#4400

#4406

#441

#441

#4411

#4412

#4414

#4435

#4439

#4439

#4451

#4452

#4452

#4456

#4459

#4465

#4468

#4472

#4476

#4477

#4483

#4486

#4487

#4489

#4491

#4495

#4496

#4497

#4498

#450

#4500

#4502

#4504

#4505

#4506

#4508

#4509

#4512

#4513

#4516

#4517

#4520

#4521

#4522

#4522

#4523

#4524

#4525

#4526

#4528

#4531

#4531

#4532

#4533

#4536

#4537

#4539

#4540

#4541

#4542

#4543

#4544

#4545

#4546

#4547

#4548

#4549

#4550

#4551

#4553

#4555

#4555

#4557

#4558

#4560

#4562

#4563

#4565

#4566

#4567

#4570

#4572

#4573

#4574

#4575

#4577

#4579

#4580

#4581

#4582

#4583

#4584

#4585

#4587

#4588

#4590

#4591

#4592

#4594

#4595

#4597

#4600

#4601

#4602

#4603

#4604

#4605

#4606

#4607

#4608

#4609

#461

#4611

#4612

#4613

#4614

#4615

#4616

#4617

#4620

#4623

#4624

#4625

#4628

#4631

#4633

#4634

#4635

#4636

#4637

#4638

#4639

#4640

#4645

#4646

#4648

#4652

#4654

#4654

#4659

#4661

#4663

#4663

#4664

#4665

#4668

#4669

#4670

#4672

#4677

#4679

#4680

#4682

#4683

#4684

#4688

#4689

#4693

#4695

#4697

#4698

#4699

#4700

#4701

#4704

#4707

#4708

#4709

#4711

#4712

#4715

#4716

#4718

#4719

#4721

#4722

#4723

#4724

#4726

#4727

#4728

#4729

#4734

#4735

#4736

#4737

#4738

#4742

#4743

#4744

#4747

#4748

#4749

#4750

#4753

#4754

#4757

#4758

#4760

#4763

#4764

#4765

#4766

#4768

#4770

#4771

#4774

#4775

#4777

#4779

#4782

#4783

#4785

#4786

#4787

#4789

#4790

#4791

#4793

#4795

#4796

#4797

#4799

#4800

#4801

#4802

#4803

#4805

#4807

#4808

#4809

#4814

#4815

#4816

#4820

#4830

#4833

#4835

#4836

#4837

#4838

#4839

#4840

#4843

#4843

#4846

#4847

#4848

#4849

#4850

#4851

#4853

#4857

#4858

#4860

#4860

#4866

#4867

#4870

#4871

#4872

#4873

#4874

#4876

#4877

#4878

#4879

#4880

#4881

#4884

#4885

#4886

#4887

#4888

#4891

#4893

#4894

#4895

#4896

#4897

#4900

#4902

#4904

#4905

#4906

#4907

#4908

#4909

#4910

#4911

#4912

#4914

#4915

#4917

#4919

#4920

#4921

#4922

#4923

#4924

#4927

#4929

#4930

#4931

#4932

#4933

#4934

#4935

#4936

#4937

#4938

#4939

#4940

#4941

#4942

#4943

#4944

#4947

#4948

#4949

#4950

#4952

#4953

#4954

#4955

#4957

#4958

#4959

#496

#4960

#4963

#4964

#4965

#4965

#4966

#4968

#4969

#4970

#4970

#4971

#4973

#4973

#4976

#4977

#4978

#4979

#4980

#4981

#4982

#4984

#4985

#4986

#4987

#4988

#4989

#4989

#4990

#4991

#4992

#4994

#4994

#4995

#4997

#4999

#5

#5000

#5001

#5003

#5007

#5008

#5011

#5014

#5015

#5015

#5016

#5017

#5018

#5018

#5019

#5020

#5021

#5024

#5025

#5027

#5028

#5029

#5031

#5032

#5033

#5034

#5035

#5037

#5039

#5040

#5041

#5043

#5044

#5049

#5050

#5051

#5052

#5055

#5056

#5057

#5058

#5059

#5061

#5062

#5063

#5064

#5065

#5067

#5070

#5071

#5072

#5075

#5077

#5078

#508

#5080

#5081

#5082

#5083

#5084

#5086

#5087

#5088

#5089

#5090

#5092

#5093

#5094

#5096

#5097

#5098

#5099

#5099

#510

#5100

#5101

#5102

#5102

#5105

#5107

#5108

#5108

#5109

#5109

#5110

#5110

#5111

#5112

#5113

#5114

#5115

#5116

#5118

#5119

#5120

#5123

#5124

#5125

#5126

#5127

#5128

#5131

#5132

#5133

#5134

#5137

#5138

#5139

#5141

#5142

#5142

#5144

#5145

#5146

#5147

#5148

#5151

#5152

#5154

#5156

#5157

#5158

#5159

#5160

#5160

#5161

#5161

#5162

#5163

#5164

#5165

#5166

#5167

#5168

#5169

#5170

#5171

#5172

#5172

#5173

#5174

#5176

#5177

#5178

#5179

#5180

#5181

#5182

#5183

#5184

#5185

#5185

#5186

#5186

#5187

#5188

#5189

#5190

#5191

#5192

#5193

#5193

#5194

#5195

#5199

#5199

#5200

#5201

#5201

#5202

#5203

#5204

#5204

#5205

#5205

#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.12.0

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

8c20571136 Merge branch 'release/3.2.0' 3.2.0 Niels Lohmann 2018-08-20 19:36:10 +02:00
dfe607c6ff Export package to allow builds without installing Dennis Fischer 2018-08-20 09:23:12 +02:00
9f3857ef6f 🔖 set version to 3.2.0 Niels Lohmann 2018-08-18 18:46:15 +02:00
7608a64e1e 🔨 fixed amalgamation Niels Lohmann 2018-08-18 18:14:12 +02:00
a7b02bdce0 🔖 preparing 3.2.0 release Niels Lohmann 2018-08-18 17:48:49 +02:00
c6a482b16c 📝 added example for sax_parse Niels Lohmann 2018-08-18 15:42:18 +02:00
5ad52f4167 ⬆️ Catch 1.12.0 Niels Lohmann 2018-08-18 12:02:12 +02:00
3811daa8a3 📝 release preparation Niels Lohmann 2018-08-18 12:00:14 +02:00
6899fa304c Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-08-18 08:15:06 +02:00
57faaf42ca 🚨 fixed a compiler warning Niels Lohmann 2018-08-18 08:15:03 +02:00
f78ac4fbd3 Merge pull request #1200 from thyu/develop Niels Lohmann 2018-08-18 08:14:04 +02:00
3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax Tsz-Ho Yu 2018-08-18 01:12:19 +01:00
e33b31e6aa 🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) Niels Lohmann 2018-08-17 23:09:45 +02:00
b5c54b41fd 📝 overworked documentation Niels Lohmann 2018-08-16 21:53:47 +02:00
07494e06d7 🚨 fixed some compiler warnings Niels Lohmann 2018-08-16 18:20:30 +02:00
d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax Niels Lohmann 2018-08-16 17:47:55 +02:00
0cc3db4f15 add static_asserts on SAX interface Théo DELRIEU 2018-07-24 14:47:41 +02:00
38f8a51a8f use abstract sax class in parser tests Théo DELRIEU 2018-08-16 10:52:33 +02:00
9bbb133094 remove no_limit constant and default values Théo DELRIEU 2018-07-24 13:09:08 +02:00
442886d040 use templates in the sax interface instead of virtuals Théo DELRIEU 2018-07-02 10:14:37 +02:00
f6febbe359 split meta.hpp, add detected_t (used to define concepts) Théo DELRIEU 2018-07-24 13:22:44 +02:00
3ac2d81a95 🔨 fixed a MinGW error #1193 Niels Lohmann 2018-08-14 22:13:56 +02:00
be2065dce9 🚨 fixing a MinGW warning #1192 Niels Lohmann 2018-08-14 22:11:47 +02:00
fed70f6bff 🎨 reindented code Niels Lohmann 2018-08-14 22:11:08 +02:00
0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch Niels Lohmann 2018-08-14 21:56:29 +02:00
861ee400cc Merge pull request #1176 from grembo/develop Niels Lohmann 2018-08-14 21:48:49 +02:00
3ce4325350 📝 updated documentation of used compilers Niels Lohmann 2018-08-01 22:31:51 +02:00
ba4a19d4af 👷 added more CI workers Niels Lohmann 2018-08-01 20:59:58 +02:00
043eff5ba8 👷 added more CI workers Niels Lohmann 2018-07-31 21:18:33 +02:00
05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4. Michael Gmelin 2018-07-29 11:57:56 +02:00
d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 Michael Gmelin 2018-07-29 01:29:50 +02:00
3760a38b7e 🏁 implicit conversion is not allowed with MSVC Niels Lohmann 2018-07-21 11:47:05 +02:00
5b14411669 🏁 trying to fix C2440 error Niels Lohmann 2018-07-21 10:59:00 +02:00
347e77bdc1 🚑 fix for #1169 Niels Lohmann 2018-07-21 10:31:55 +02:00
04372a8c56 🏁 fix for #1168 Niels Lohmann 2018-07-19 17:31:50 +02:00
d0e60de433 Add new JSON_INTERNAL_CATCH macro function Hyeon Kim 2018-07-19 15:43:41 +09:00
7bfc406ded 📝 added note about CocoaPods #1148 Niels Lohmann 2018-07-05 21:18:46 +02:00
d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix Niels Lohmann 2018-06-29 09:03:43 +02:00
b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114 Sonu Lohani 2018-06-29 09:34:41 +05:30
39dd775e38 🔨 cleanup after #1134 Niels Lohmann 2018-06-28 21:32:32 +02:00
86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator Niels Lohmann 2018-06-28 21:21:17 +02:00
396a914f9e 🔨 added macro to disable compiler check #1128 Niels Lohmann 2018-06-26 22:47:40 +02:00
bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix Niels Lohmann 2018-06-26 07:58:45 +02:00
515cfc2d89 Merge pull request #1142 from jrakow/develop Niels Lohmann 2018-06-24 23:33:30 +02:00
963d06a13c 📝 fix links to cppreference named requirements Julius Rakow 2018-06-24 22:30:37 +02:00
9f00db48d9 📝 link to cppreference via HTTPS Julius Rakow 2018-06-24 22:29:33 +02:00
ec2ebd5ec9 meson: add multiple headers target Julius Rakow 2018-06-24 16:53:02 +02:00
0bb36bb140 meson: fix include directory Julius Rakow 2018-06-23 20:45:00 +02:00
62457729e8 📝 mentioned MinGW in README Niels Lohmann 2018-06-24 18:03:59 +02:00
09c0df4a21 👷 choosing correct image Niels Lohmann 2018-06-24 17:40:16 +02:00
1bbc4a0859 👷 using Ninja to speed up build Niels Lohmann 2018-06-24 17:10:13 +02:00
d8fe13fc83 🔨 fixed escaping for MinGW Niels Lohmann 2018-06-24 16:57:53 +02:00
e59b930927 👷 trying a more recent compiler Niels Lohmann 2018-06-24 16:40:47 +02:00
937d68e2e5 👷 forgot old PATH Niels Lohmann 2018-06-24 16:37:02 +02:00
989ad9b759 👷 using help from https://stackoverflow.com/a/48509334/266378 Niels Lohmann 2018-06-24 16:35:16 +02:00
067e288289 👷 set build type Niels Lohmann 2018-06-24 16:29:03 +02:00
7bbc06b487 👷 forgot quotes Niels Lohmann 2018-06-24 16:18:44 +02:00
441e5d87e6 👷 experimenting with AppVeyor and MinGW Niels Lohmann 2018-06-24 16:17:06 +02:00
7fa4ddf93e 💄 fixed indentation Niels Lohmann 2018-06-23 17:27:40 +02:00
bf348ca8a4 Merge pull request #1028 from gracicot/develop Niels Lohmann 2018-06-23 17:10:04 +02:00
ed6a0686df 🔨 small refactoring to improve branch coverage Niels Lohmann 2018-06-23 17:05:04 +02:00
c8bfdfd961 👷 tryping different platforms for AppVeyor Niels Lohmann 2018-06-23 11:12:32 +02:00
c02de445bf 🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 11:00:42 +02:00
66dd1a846d 🚨 fixed more compiler warnings Niels Lohmann 2018-06-23 10:47:55 +02:00
850922269d 🚨 removed compiler warnings Niels Lohmann 2018-06-23 10:28:04 +02:00
0460b90977 📝 fix for #1052 #1139 Niels Lohmann 2018-06-22 22:35:48 +02:00
85f35a1d59 📝 documentation fix Niels Lohmann 2018-06-22 22:34:42 +02:00
e7c1638d11 💄 cleanup Niels Lohmann 2018-06-18 22:03:46 +02:00
1c81e9f5ae Merge pull request #1130 from agrianius/develop Niels Lohmann 2018-06-18 22:01:53 +02:00
d505ed7b31 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion Niels Lohmann 2018-06-18 21:59:46 +02:00
2c920a1032 run make amalgamate Théo DELRIEU 2018-06-18 10:53:51 +02:00
2b37d7ed86 from_json: add overload for std::unordered_map Théo DELRIEU 2018-06-18 10:53:30 +02:00
299469cfd5 from_json: add missing template arguments for std::map Théo DELRIEU 2018-06-18 10:52:11 +02:00
1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed Danielc 2018-06-16 12:01:49 +03:00
f574d7e084 simplify templates for operators, add more checks Vitaliy 2018-06-13 19:47:29 +03:00
cd28d872e7 forward declarations to make new compilers happy Vitaliy 2018-06-11 20:50:39 +03:00
3d3055909c define global operator< for const char* and alt_string Vitaliy 2018-06-11 19:09:57 +03:00
4feb8211ca test (non)equality for alt_string implementation Vitaliy 2018-06-11 18:03:46 +03:00
14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop Guillaume Racicot 2018-06-04 11:18:25 -04:00
7acd90b651 Fixed check for compatible string type Guillaume Racicot 2018-06-04 11:18:19 -04:00
5676a2a076 Aligned template declaration Guillaume Racicot 2018-06-03 23:51:07 -04:00
e0e7fa39e7 Re-added external_constructor with string compatible types Guillaume Racicot 2018-06-03 23:49:13 -04:00
4778c02ab5 Set MSVC version from 1514 and older Guillaume Racicot 2018-06-01 14:42:25 -04:00
714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older Guillaume Racicot 2018-06-01 14:22:57 -04:00
e830bc502f Merge pull request #1117 from TinyTinni/develop Niels Lohmann 2018-06-01 08:05:45 +02:00
ecadcdb593 added char cast Matthias Möller 2018-05-31 16:36:16 +02:00
48656a49f5 typo Matthias Möller 2018-05-31 15:32:21 +02:00
64acb42aa7 remove stringstream dependency Matthias Möller 2018-05-31 13:27:11 +02:00
8efbf8d7bb 📝 documentation to avoid future issues like #1108 Niels Lohmann 2018-05-28 18:14:44 +02:00
e5a67fc3f8 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-05-28 17:57:46 +02:00
a49644ab74 🚑 adjusted Fuzzer to new parser Niels Lohmann 2018-05-28 17:57:22 +02:00
0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion Niels Lohmann 2018-05-28 14:53:23 +02:00
c5e63fd684 Provide a from_json overload for std::map Théo DELRIEU 2018-05-14 11:51:37 +02:00
db03d09312 Merge branch 'feature/key_ref' into develop (fixes #1098) Niels Lohmann 2018-05-27 22:26:00 +02:00
cf9299d222 Merge branch 'feature/sax2' into develop #971 Niels Lohmann 2018-05-27 18:12:59 +02:00
3cdc4d784b 📝 added documentation Niels Lohmann 2018-05-27 18:07:53 +02:00
adf09726b0 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-27 14:26:13 +02:00
481ace65c4 🔨 only calculate array index string when needed #1098 Niels Lohmann 2018-05-27 12:04:22 +02:00
1c6b332dcd :ok_hand: mitigating cppcheck bug #1101 Niels Lohmann 2018-05-26 14:10:13 +02:00
90eb0a91e0 ⚡ keys are now returned as const reference #1098 Niels Lohmann 2018-05-26 13:26:40 +02:00

... 24 25 26 27 28 ...