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

• a99fcb4e7d Add comments and newline Jamie Seward 2017-10-17 22:53:35 -0700
• 917d9d8bc3 Fix Visual Studio 2017 warnings Jamie Seward 2017-10-16 23:23:55 -0700
• 7c8f0a4186 Merge pull request #785 from jseward/develop Niels Lohmann 2017-10-16 19:48:17 +0200
• b27a142ec0 Merge pull request #783 from eld00d/patch-1 Niels Lohmann 2017-10-16 17:54:28 +0200
• a8cc7a1bc8 Consistently use std::char_traits int_type-->char conversion intrinsics Perry Kundert 2017-10-16 08:06:10 -0700
• af99090742 Disable warning C4389: '==': signed/unsigned mismatch Jamie Seward 2017-10-16 01:02:48 -0700
• 8ba7f69ab4 Fix whitespace Jamie Seward 2017-10-16 00:49:59 -0700
• 8a4af820c7 Fix warning C4706 Jamie Seward 2017-10-16 00:41:58 -0700
• 19f8f1c075 Add missing "u8" Jamie Seward 2017-10-16 00:21:38 -0700
• 5ec44fe9e3 Add /W4 for MSVS Jamie Seward 2017-10-15 22:56:38 -0700
• 727ee7d03e Set GENERATE_TAGFILE in Doxyfile Nate Vargas 2017-10-14 19:06:38 -0500
• d300a8e268
  🚨 fixed warnings #776 Niels Lohmann 2017-10-13 08:46:29 +0200
• 0b803d0a5f Simplify the json/src/benchmarks.cpp to allow more optimal code gen. o For some unknown reason, the complexity of the benchmark platform prevented some C++ compilers from generating optimal code, properly reflective of the real performance in actual deployment. o Added the json_benchmarks_simple target, which performs the same suite of tests as json_benchmarks. o Simplified the benchmark platform, and emit an "Average" TPS (Transactions Per Second) value reflective of aggregate parse/output performance. Perry Kundert 2017-10-07 15:50:19 -0700
• 23440eb86e Remove outdated commentary about the value of eof(), retain input type o We assume the same character int_type as the unerlying std::istream o There are no assumptions on the value of eof(), other than that it will not be a valid unsigned char value. o To retain performance, we do not allow swapping out the underlying std::streambuf during our use of the std::istream for parsing. Perry Kundert 2017-10-06 12:27:53 -0700
• 45e1e3d48a Revert some unnecessary member initializer changes. Perry Kundert 2017-10-06 07:53:31 -0700
• 5e480b56d8 Further simplify character type handling Perry Kundert 2017-10-06 07:37:49 -0700
• 1b43a45bec Implement correct handling of std::streambuf int_type, eof() o Make no assumptions about eof(), other than that it is somewhere outside of the valid range of char_type. Perry Kundert 2017-10-05 15:37:03 -0700
• 184dab60e6 Accelerate access to underlying std::istream streambuf Perry Kundert 2017-10-05 14:13:55 -0700
• f775922ca8 Specify initializers for yytest, token_string using initializer-lists o We can retain -Weffc++ and specify default initializers by using initializer lists. The risks are low (of additional non-conformat compilers), because there is already one other such initialization used in the code-base. Perry Kundert 2017-10-04 15:01:10 -0700
• 546e148b24 Further performance improvements, and corrections in get_token_string o An (-'ve valued, typically -1) EOF must never be allowed in token_string, as it be converted to 255 -- a legitimate value. o Comparing against a specific eof() (-1, typically) is more costly than detecting +'ve/-'ve. Since EOF is the only non-positive value allowed we can use the simpler test. o Removed unnecessary test for token_string size, as it is already tested in the method, and must never occur in correct code; used an assert instead. Perry Kundert 2017-10-04 11:31:10 -0700
• 8665e25942 Rename get_string to move_string to imply side-effect Perry Kundert 2017-10-04 10:47:52 -0700
• e0d890cc23 Corrected unnnecessary const restriction on returned std::string Perry Kundert 2017-10-04 10:21:55 -0700
• 97a388802d Improve performance by constructing yytext as a std::string o Return its contents when necessary. In many cases, this avoids construction of multiple copies of the yytext token. Exceeds performance of current develop branch. Perry Kundert 2017-10-04 08:40:32 -0700
• 7c523338c5 Remove unnnecessary NUL termination of yytext (as it may contain NULs) Perry Kundert 2017-10-04 08:33:35 -0700
• 14ca1f6f09 Restore istream performance #764 o Use std::streambuf I/O instead of std::istream; does not maintain (unused) istream flags. o Further simplify get/unget handling. o Restore original handling of NUL in input stream; ignored during token_string escaping. Perry Kundert 2017-10-03 14:38:38 -0700
• 12efeadc2e Further simplify istream handling; use native unget Perry Kundert 2017-10-03 08:49:39 -0700
• f585fe4eec Test to confirm parsing of multiple JSON records in a istream #367 Perry Kundert 2017-10-02 14:17:23 -0700
• 90adf6ec20 Simplify get_token_string, unnecessary buffering, handle Byte Order Mark Perry Kundert 2017-10-02 08:50:15 -0700
• 0c0851dbea
  📝 comment how to integrate tsl::ordered_map (#546) Niels Lohmann 2017-10-05 20:36:18 +0200
• bab4a15748
  📝 comment how to integrate fifo_map (#485) Niels Lohmann 2017-10-05 20:33:27 +0200
• 60439aff05
  📝 different cmake call Niels Lohmann 2017-10-05 19:43:59 +0200
• 73d1b55aba
  🔧 executing tests in parallel Niels Lohmann 2017-10-05 19:43:39 +0200
• 615366447a
  🔧 removing -Weffc++ warnings Niels Lohmann 2017-10-05 19:43:19 +0200
• 73727c989c
  Merge branch 'feature/coveralls' into develop Niels Lohmann 2017-10-05 19:08:28 +0200
• 75f4678b96
  🔨 added filter script for branch coverage Niels Lohmann 2017-10-05 19:08:15 +0200
• c204ac82e0
  🔨 adjusted Coverity script to work without Makefile Niels Lohmann 2017-10-05 07:13:59 +0200
• 7b82e4b4c8
  🔨 added Makefile target to calculate lcov coverage Niels Lohmann 2017-10-05 00:17:09 +0200
• 1b3df3a63f
  🔨 trying to use Coveralls with CMake #698 Niels Lohmann 2017-10-04 22:18:21 +0200
• 1dfb01cb55 Merge da466c5469 into 99ee4c1eaf Alex 2017-10-04 17:33:06 +0000
• 99ee4c1eaf
  🔨 cleaned up Makefiles and docs #698 Niels Lohmann 2017-10-04 19:27:35 +0200
• 5cb6d7187d
  🚨 fixing last warning in #755 Niels Lohmann 2017-10-04 17:28:35 +0200
• 4e81c1db47 Merge pull request #765 from nlohmann/feature/issue698 Niels Lohmann 2017-10-04 10:39:56 +0200
• e2045eae53
  🏁 and another try Niels Lohmann 2017-10-03 18:47:08 +0200
• a85bc358f7
  🏁 another try Niels Lohmann 2017-10-03 18:21:40 +0200
• 3457e7bc5b
  🏁 try to get MSVC 2017 running again Niels Lohmann 2017-10-03 17:57:40 +0200
• 54bd1b5124
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-03 17:23:05 +0200
• 7435d54e97
  🔨 clean up Niels Lohmann 2017-10-02 23:06:41 +0200
• 4912231450
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 18:25:25 +0200
• b91805e1f0
  🚨 removing a compiler warning #755 Niels Lohmann 2017-10-02 18:11:36 +0200
• f89f8b2d0b
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 17:47:53 +0200
• 8be303d4fb
  🏁 fixing a min() call for MSVC #762 Niels Lohmann 2017-10-02 13:54:14 +0200
• 1df836ce40
  ⏪ removed call to std::signbit #761 Niels Lohmann 2017-10-01 15:48:29 +0200
• 8af49d4be5
  🚨 removing compiler warnings #755 Niels Lohmann 2017-09-30 11:00:26 +0200
• 1a66527dca
  📝 fixed documentation #745 Niels Lohmann 2017-09-30 10:18:18 +0200
• b05ea3de55 Merge pull request #753 from gregmarr/patch-1 Niels Lohmann 2017-09-26 22:36:36 +0200
• ec60ff3451 Add info for the vcpkg package. gregmarr 2017-09-26 08:39:38 -0700
• da466c5469 Merge pull request #1 from di9it/di9it-show-what Alex 2017-09-20 00:07:43 +0300
• 2f5ec0b848 Show last breath error Alex 2017-09-20 00:04:34 +0300
• 647711fad1
  ✅ improved test coverage Niels Lohmann 2017-09-14 17:31:28 +0200
• 737816d0cd
  👷 another try with Travis Niels Lohmann 2017-09-14 17:31:14 +0200
• e75adc21a5
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-13 18:57:25 +0200
• b90529c36d
  ✅ improved test coverage Niels Lohmann 2017-09-13 18:56:54 +0200
• 82c93680d1
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 22:38:23 +0200
• e2e0ecd867
  ✅ improved test coverage Niels Lohmann 2017-09-10 22:38:04 +0200
• 248db1e423
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 11:42:57 +0200
• 7410763731
  ✅ improved test coverage Niels Lohmann 2017-09-10 11:42:43 +0200
• cafc2d057a
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 10:22:10 +0200
• da97cf7895
  ✅ improved test coverage Niels Lohmann 2017-09-10 10:21:53 +0200
• 295d65ada7
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 01:13:43 +0200
• fcba9ec537
  🔨 clean up Niels Lohmann 2017-09-10 01:12:03 +0200
• 41994ba028
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 16:53:37 +0200
• b21d7810fa
  ✅ improved test coverage Niels Lohmann 2017-09-09 16:53:27 +0200
• c1d6478584
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 13:07:40 +0200
• 9ae6796a38
  ✅ improved test coverage Niels Lohmann 2017-09-09 13:07:10 +0200
• 31ce7e1e59
  Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 11:05:20 +0200
• fd250ae2b1
  ✅ improved test coverage Niels Lohmann 2017-09-09 11:04:58 +0200
• 5c08b84dec
  ⏪ back to previous MSVC 2017 Niels Lohmann 2017-09-06 18:26:52 +0200
• da14286abb
  👷 try to use MSVC 2017 again Niels Lohmann 2017-09-06 18:13:35 +0200
• c607b5c2ac
  📝 improved documentation Niels Lohmann 2017-09-06 17:14:06 +0200
• 3bfd6e230b Merge 1fc6dcead0 into 91e0032853 Ilya Malyavskiy 2017-08-30 01:38:01 +0000
• 91e0032853
  📝 improved documentation Niels Lohmann 2017-08-29 23:46:26 +0200
• b41b13047c
  👷 removed unneccessary test Niels Lohmann 2017-08-27 11:30:36 +0200
• 15e757c42b
  🔨 trying to fix memory issue with valarray Niels Lohmann 2017-08-27 10:41:39 +0200
• 0e94ba8857
  👷 using the same compilers Niels Lohmann 2017-08-26 08:56:34 +0200
• 4f5c345817
  👷 run sanitizer another time to check if it works Niels Lohmann 2017-08-26 08:20:37 +0200
• 8608f42187
  👷 trying to use libstdc++ Niels Lohmann 2017-08-25 22:49:18 +0200
• 5e7acbf05e
  👷 adjusted flags for Clang sanitizer Niels Lohmann 2017-08-25 22:34:00 +0200
• 268f5a3d0a
  👷 added option to switch off exceptions Niels Lohmann 2017-08-25 21:29:27 +0200
• 839681ff9f
  👷 using Ninja Niels Lohmann 2017-08-25 21:01:07 +0200
• 3dcd360139
  👷 adding status messages Niels Lohmann 2017-08-25 20:19:58 +0200
• 05b97c473a
  👷 added flags for Valgrind and Clang sanitizer Niels Lohmann 2017-08-25 20:12:21 +0200
• c87b080cc5
  👷 new cmake file for test cases Niels Lohmann 2017-08-25 18:06:22 +0200
• 1fc6dcead0 There are changes that make possible to instantiate and use the nlohmann::json with custom map, vector and string types. In my case it was caused by need to use custom allocator. Ilya Malyavskiy 2017-08-25 15:47:09 +0700
• 805d07080c Merge 0f766b4580 into 5b71bf09a1 Matthew O'Connell 2017-08-24 12:07:48 +0000
• 5b71bf09a1 Merge pull request #708 from theodelrieu/fix/from_json_tuple_pair Niels Lohmann 2017-08-24 12:40:16 +0200
• bb1b4c934e
  fix from_json implementation for pair/tuple Théo DELRIEU 2017-08-22 23:40:10 +0200
• e45eaf6e30
  Revert "👷 using libc++ with Clang" Niels Lohmann 2017-08-23 08:39:19 +0200
• 0b5e8f859b
  🔨 cleanup Niels Lohmann 2017-08-23 00:42:15 +0200
• 9fd031b6f4
  🐛 re-added support for std::valarray #702 Niels Lohmann 2017-08-22 23:28:23 +0200
• 41b2c69bdb
  👷 using libc++ with Clang Niels Lohmann 2017-08-22 22:04:38 +0200