Commit Graph

Select branches

Hide Pull Requests

add-ci-step-windows

bon8

clang-format

clang-tidy

coverity_scan

dependabot/github_actions/github/codeql-action-4.32.2

dependabot/github_actions/lukka/get-cmake-4.2.3

dependabot/pip/cmake/requirements/cppcheck-1.5.1

develop

feature/optional

gh-pages

issue2228

issue2615

issue3989

issue4552-ignore

issue4755-cppcheck-warning

master

nlohmann-patch-1-1

nvcc-image

views-test

#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

#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

#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

#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

#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

#4024

#4032

#4033

#4035

#4036

#4039

#4040

#4043

#4044

#4045

#4046

#4047

#4055

#4056

#4057

#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

#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

#4477

#4483

#4486

#4487

#4489

#4491

#4495

#4496

#4497

#4498

#4498

#450

#4500

#4502

#4504

#4505

#4506

#4508

#4509

#4512

#4513

#4516

#4517

#4520

#4521

#4522

#4522

#4523

#4524

#4525

#4526

#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

#4563

#4565

#4566

#4567

#4570

#4572

#4573

#4574

#4575

#4577

#4579

#4580

#4581

#4582

#4583

#4584

#4585

#4587

#4587

#4588

#4590

#4591

#4592

#4594

#4595

#4597

#4600

#4601

#4602

#4603

#4604

#4605

#4606

#4607

#4608

#4609

#461

#4611

#4612

#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

#4753

#4754

#4757

#4758

#4758

#4760

#4763

#4764

#4765

#4766

#4768

#4770

#4771

#4774

#4775

#4777

#4779

#4782

#4783

#4785

#4786

#4787

#4789

#4790

#4791

#4793

#4795

#4796

#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

#4920

#4921

#4922

#4923

#4924

#4927

#4929

#4930

#4931

#4932

#4933

#4934

#4935

#4936

#4936

#4937

#4938

#4939

#4940

#4941

#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

#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

#5017

#5018

#5018

#5019

#5020

#5021

#5024

#5025

#5027

#5028

#5029

#5031

#5032

#5033

#5034

#5035

#5037

#5039

#5040

#5041

#5043

#5044

#5049

#5049

#5050

#5051

#5052

#5055

#5056

#5057

#5058

#5059

#5061

#5062

#5063

#5064

#5065

#5065

#5067

#5070

#5071

#5072

#5072

#5075

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

Mono Color

• f434942371 REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse dan-42 2017-07-29 11:59:09 +02:00
• c819a2d732 🔨 refactored some scanner internals Niels Lohmann 2017-07-28 19:18:50 +02:00
• 5851daa576 ✨ binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 Niels Lohmann 2017-07-28 00:21:55 +02:00
• c136b6f200 Merge pull request #666 from effolkronium/develop Niels Lohmann 2017-07-27 20:48:56 +02:00
• 7d51214045 ✨ implemented exception-free parser #458 #582 Niels Lohmann 2017-07-27 20:33:11 +02:00
• a27dd3a6f6 enable_testing only if JSON_BuildTests is ON Ilya Polishchuk 2017-07-27 17:50:24 +03:00
• 669ebf51bc 🔨 fixed an error in MSVC Niels Lohmann 2017-07-27 06:04:35 +02:00
• 3d589fd032 🔨 fixed compilation error Niels Lohmann 2017-07-26 23:59:56 +02:00
• e6aa700360 🔨 cleanup Niels Lohmann 2017-07-26 23:44:55 +02:00
• 93bb71232d Move from rvalues eagerly to work around MSVC problem Nikita Ofitserov 2017-07-25 12:17:32 +03:00
• 897879bccb Make detail::json_ref do less work by deferring moves/copies Nikita Ofitserov 2017-07-24 12:29:06 +03:00
• 0f4978e503 Fix an actually invalid test Nikita Ofitserov 2017-07-24 01:02:03 +03:00
• 4414f94cd5 🔨 using input/output adapters for CBOR and MessagePack Niels Lohmann 2017-07-23 23:02:24 +02:00
• f5cae64e52 Update tests while fixing possible UB Nikita Ofitserov 2017-07-23 23:59:34 +03:00
• 09cda57309 Support moving from rvalues in an std::initializer_list Nikita Ofitserov 2017-07-23 23:57:17 +03:00
• cf3ca3b78c Optimize json construction from rvalue string_t/array_t/object_t Nikita Ofitserov 2017-07-23 23:50:59 +03:00
• 7b3cbfff23 Add some tests for std::move from std::initializer_list Nikita Ofitserov 2017-07-23 23:47:15 +03:00
• 9b1c058810 🔨 reorganized interfaces for parse/accept functions #623 Niels Lohmann 2017-07-23 18:11:34 +02:00
• 18e0430bfe 🔨 adding destroy function to discard values Niels Lohmann 2017-07-22 22:57:22 +02:00
• 5b5f0090a1 🔨 trying to fix the sanitizer error Niels Lohmann 2017-07-22 16:41:42 +02:00
• d53ef95067 🔨 fixed some warnings Niels Lohmann 2017-07-22 15:33:31 +02:00
• c7a69ae03e ⚡ started working on parser with provded result reference #418 Niels Lohmann 2017-07-22 15:18:38 +02:00
• f513c46749 🔨 further cleanup Niels Lohmann 2017-07-22 13:35:04 +02:00
• 024fec8a9b 🔨 more cleanup using clang-tidy Niels Lohmann 2017-07-21 18:26:07 +02:00
• a09193e967 🔨 cleanup Niels Lohmann 2017-07-20 23:01:16 +02:00
• 21d23982ca 🐛 fix for #656 Niels Lohmann 2017-07-17 07:53:02 +02:00
• 8a9133c6b2 Merge pull request #652 from olegendo/develop Niels Lohmann 2017-07-15 11:39:27 +02:00
• f1fabd1ba2 📄 added code of conduct Niels Lohmann 2017-07-13 19:16:41 +02:00
• dad4916f9e Merge pull request #654 from ryanjmulder/develop Niels Lohmann 2017-07-12 07:58:45 +02:00
• 486f3a2d16 restore necessary comman in documentation of dump Ryan Mulder 2017-07-11 14:18:02 -04:00
• 40461c6c55 update comment on dump to not indicate that ensure_ascii is true by default Ryan Mulder 2017-07-11 13:59:07 -04:00
• 71597be294 add ensure_ascii parameter to dump. #330 Ryan Mulder 2017-07-11 13:41:56 -04:00
• cd800522e4 Rename BuildTests to JSON_BuildTests Oleg Endo 2017-07-11 22:57:49 +09:00
• 7dee868a42 Merge pull request #643 from theodelrieu/refacto/split_basic_json Niels Lohmann 2017-07-09 23:12:35 +02:00
• 8585d35c92 move serializer outside of basic_json Théo DELRIEU 2017-07-09 17:43:59 +02:00
• acff23efb2 move binary_{reader,writer} outside of basic_json Théo DELRIEU 2017-07-09 17:31:25 +02:00
• bb752fd30c move json_reverse_iterator outside of basic_json Théo DELRIEU 2017-07-09 17:20:03 +02:00
• 0ba98b6fe0 move internal_iterator/iter_impl/iteration_proxy outside of basic_json Théo DELRIEU 2017-07-09 16:53:36 +02:00
• 00d6e27194 move primitive_iterator outside of basic_json Théo DELRIEU 2017-07-01 20:18:42 +02:00
• 8e681d1e57 move lexer/parser outside of basic_json Théo DELRIEU 2017-07-09 16:38:24 +02:00
• 15625ca4a7 move input adapters outside of basic_json Théo DELRIEU 2017-07-01 20:01:28 +02:00
• a332142194 move json_pointer outside of basic_json Théo DELRIEU 2017-07-01 19:52:18 +02:00
• fe086d7432 forward declare basic_json, add two macros Théo DELRIEU 2017-07-01 19:44:05 +02:00
• d3496347fc 👷 removing Clang 3.9 and 4.0 Niels Lohmann 2017-07-09 12:19:14 +02:00
• 504012a3db 📝 cleanup after #650 Niels Lohmann 2017-07-09 11:51:38 +02:00
• a0e0579374 Merge pull request #650 from olegendo/develop Niels Lohmann 2017-07-09 11:12:46 +02:00
• 1b2fabe802 👷 adding two recent Clang versions Niels Lohmann 2017-07-09 11:10:18 +02:00
• e3bb156f82 fix typo Oleg Endo 2017-07-09 15:20:28 +09:00
• b753cb6ee7 use std::make_shared Oleg Endo 2017-07-09 15:19:08 +09:00
• f0ca96d462 include <iosfwd> instead of <iostream> Oleg Endo 2017-07-09 15:04:49 +09:00
• f1c543cb7b 👷 added GCC7 Niels Lohmann 2017-07-08 22:59:19 +02:00
• 7b05e1a687 🔨 improved performance in dump for deeply nested values Niels Lohmann 2017-07-08 22:59:04 +02:00
• f697fec522 📝 fixed documentation Niels Lohmann 2017-07-08 22:16:45 +02:00
• 87bccbc335 🔨 removed exception parse_error.111 Niels Lohmann 2017-07-08 21:35:13 +02:00
• b38ecb5ca9 🔨 simplified binary write Niels Lohmann 2017-07-08 20:31:13 +02:00
• b3ac36db93 🔨 excluded uncovered lines Niels Lohmann 2017-07-08 18:34:08 +02:00
• e67df7c385 Merge branch 'feature/undo_171' into develop Niels Lohmann 2017-07-08 16:34:00 +02:00
• 552622343e 📝 fixed typos Niels Lohmann 2017-07-08 16:18:27 +02:00
• 566f6dcf30 🔥 removing usused functions #645 Niels Lohmann 2017-07-08 13:33:13 +02:00
• 6f12749ef6 📝 added version string for Xcode 9 Niels Lohmann 2017-07-08 12:55:05 +02:00
• ac42333749 ⬆️ Catch v1.9.6 Niels Lohmann 2017-07-08 12:11:45 +02:00
• 015c88783e 🔨 fixed a pedantic warning Niels Lohmann 2017-07-08 12:03:12 +02:00
• df2feabb72 👷 added Xcode 9 beta Niels Lohmann 2017-07-08 11:57:09 +02:00
• 63ecbfd36b ✅ re-added test Niels Lohmann 2017-07-07 23:38:04 +02:00
• 07b78c993c 🐛 fixed undefined behavior bug Niels Lohmann 2017-07-07 23:37:16 +02:00
• 8b123107c0 🔨 fixed some pedantic GCC warnings Niels Lohmann 2017-07-07 22:41:22 +02:00
• 32065c8045 📝 fix for #639 Niels Lohmann 2017-07-07 21:16:33 +02:00
• e99b783def 🔨 simplifying scanner Niels Lohmann 2017-06-22 16:40:15 +02:00
• 3dc5d95422 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-21 18:55:28 +02:00
• b9a8425cc8 📝 cleanup after #629 and #630 Niels Lohmann 2017-06-21 18:55:25 +02:00
• 5ee651c387 Merge pull request #630 from Chocobo1/doc_neq Niels Lohmann 2017-06-21 18:54:18 +02:00
• dad6051f37 Merge pull request #629 from Chocobo1/c4819 Niels Lohmann 2017-06-21 18:54:03 +02:00
• 4b5433578a ✅ added progress output for Unicode tests Niels Lohmann 2017-06-21 18:50:11 +02:00
• 0395f3fdfb fix typo Chocobo1 2017-06-21 21:41:20 +08:00
• 66ffac9e8a Fix MSVC warning C4819 Chocobo1 2017-06-21 16:17:10 +08:00
• 6f3bebff5c 🔨 removed unexpect function Niels Lohmann 2017-06-21 07:26:50 +02:00
• 2fd214c14b 🔨 adjusted pedantic flags Niels Lohmann 2017-06-20 23:05:37 +02:00
• e7695306f1 🔨 fixed a warning Niels Lohmann 2017-06-20 22:58:02 +02:00
• 84f2e64a7c ✅ improved coverage Niels Lohmann 2017-06-20 22:35:31 +02:00
• 9add24ff10 🔨 fixed a warning Niels Lohmann 2017-06-20 22:20:41 +02:00
• 2f007ca092 ✅ improved coverage Niels Lohmann 2017-06-20 22:03:36 +02:00
• a5c27ede32 🔨 fixed a warning Niels Lohmann 2017-06-20 21:39:36 +02:00
• 7c2a187258 ✅ improved test coverage Niels Lohmann 2017-06-20 21:09:26 +02:00
• e191dd833f 🔨 fixed warning about pointer members Niels Lohmann 2017-06-20 21:09:05 +02:00
• 82b95ca664 🔨 simplified error handling in parser Niels Lohmann 2017-06-20 20:14:18 +02:00
• f2cdb3d594 ⬆️ Catch v1.9.5 Niels Lohmann 2017-06-20 20:13:56 +02:00
• c2044205ef 📝 updated used compilers Niels Lohmann 2017-06-20 16:12:14 +02:00
• c2db4a118d 👷 update Travis to use Ubuntu Trusty 14.04 images Niels Lohmann 2017-06-19 21:51:24 +02:00
• 70b7455a13 🔨 minor change Niels Lohmann 2017-06-19 21:50:36 +02:00
• 4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions Niels Lohmann 2017-06-19 17:31:10 +02:00
• 08d781058c add from_json support for std::array Théo DELRIEU 2017-06-19 12:03:38 +02:00
• 6e4910d5c5 add pair/tuple conversions Théo DELRIEU 2017-06-17 14:24:07 +02:00
• 112a6f4e53 🔨 replaced lexer's error message by const char* Niels Lohmann 2017-06-18 13:03:14 +02:00
• 747f7d36d1 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-18 00:00:36 +02:00
• b79a1a2678 📝 update after #626 Niels Lohmann 2017-06-18 00:00:31 +02:00
• 7b97100ffd Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix Niels Lohmann 2017-06-17 23:58:13 +02:00
• 04a1666ef2 Add parentheses around std::min so it bypasses the macro introduced by windows.h. Steffen Brem 2017-06-17 22:01:18 +02:00
• 1fbb82de89 🔨 using std::array to buffer input Niels Lohmann 2017-06-17 20:47:53 +02:00
• 889006f006 ✅ regression test for #600 Niels Lohmann 2017-06-17 13:37:04 +02:00
• e1ca484bc1 📝 added note about Conan #566 Niels Lohmann 2017-06-17 11:20:09 +02:00