Commit f7bc5a3
committed
Fix C++11 ABI breakage when compiled with C++17 (#1668)
When JSONCPP_HAS_STRING_VIEW was defined, the library dropped the
`const char*` and `const String&` overloads for `operator[]`, `get`,
`removeMember`, and `isMember`, breaking ABI compatibility for projects
consuming the library with C++11.
This change unconditionally declares and defines the legacy overloads
so they are always exported, restoring compatibility.1 parent 31b1a58 commit f7bc5a3
2 files changed
+10
-20
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
501 | 501 | | |
502 | 502 | | |
503 | 503 | | |
504 | | - | |
| 504 | + | |
505 | 505 | | |
506 | 506 | | |
507 | 507 | | |
| |||
516 | 516 | | |
517 | 517 | | |
518 | 518 | | |
519 | | - | |
520 | 519 | | |
521 | 520 | | |
522 | 521 | | |
| |||
534 | 533 | | |
535 | 534 | | |
536 | 535 | | |
537 | | - | |
| 536 | + | |
538 | 537 | | |
539 | 538 | | |
540 | 539 | | |
541 | 540 | | |
542 | 541 | | |
543 | 542 | | |
544 | 543 | | |
545 | | - | |
546 | 544 | | |
547 | 545 | | |
548 | 546 | | |
| |||
589 | 587 | | |
590 | 588 | | |
591 | 589 | | |
592 | | - | |
| 590 | + | |
593 | 591 | | |
594 | 592 | | |
595 | 593 | | |
596 | 594 | | |
597 | | - | |
598 | 595 | | |
599 | 596 | | |
600 | 597 | | |
| |||
603 | 600 | | |
604 | 601 | | |
605 | 602 | | |
606 | | - | |
| 603 | + | |
607 | 604 | | |
608 | 605 | | |
609 | 606 | | |
610 | 607 | | |
611 | | - | |
612 | 608 | | |
613 | 609 | | |
614 | 610 | | |
| |||
623 | 619 | | |
624 | 620 | | |
625 | 621 | | |
626 | | - | |
| 622 | + | |
627 | 623 | | |
628 | 624 | | |
629 | 625 | | |
630 | 626 | | |
631 | 627 | | |
632 | 628 | | |
633 | | - | |
634 | 629 | | |
635 | 630 | | |
636 | 631 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1200 | 1200 | | |
1201 | 1201 | | |
1202 | 1202 | | |
1203 | | - | |
| 1203 | + | |
1204 | 1204 | | |
1205 | 1205 | | |
1206 | 1206 | | |
| |||
1221 | 1221 | | |
1222 | 1222 | | |
1223 | 1223 | | |
1224 | | - | |
1225 | 1224 | | |
1226 | 1225 | | |
1227 | 1226 | | |
| |||
1265 | 1264 | | |
1266 | 1265 | | |
1267 | 1266 | | |
1268 | | - | |
| 1267 | + | |
1269 | 1268 | | |
1270 | 1269 | | |
1271 | 1270 | | |
1272 | 1271 | | |
1273 | 1272 | | |
1274 | 1273 | | |
1275 | | - | |
1276 | 1274 | | |
1277 | 1275 | | |
1278 | 1276 | | |
| |||
1292 | 1290 | | |
1293 | 1291 | | |
1294 | 1292 | | |
1295 | | - | |
| 1293 | + | |
1296 | 1294 | | |
1297 | 1295 | | |
1298 | 1296 | | |
1299 | 1297 | | |
1300 | 1298 | | |
1301 | 1299 | | |
1302 | | - | |
1303 | 1300 | | |
1304 | 1301 | | |
1305 | 1302 | | |
| |||
1312 | 1309 | | |
1313 | 1310 | | |
1314 | 1311 | | |
1315 | | - | |
| 1312 | + | |
1316 | 1313 | | |
1317 | 1314 | | |
1318 | 1315 | | |
| |||
1323 | 1320 | | |
1324 | 1321 | | |
1325 | 1322 | | |
1326 | | - | |
1327 | 1323 | | |
1328 | 1324 | | |
1329 | 1325 | | |
| |||
1357 | 1353 | | |
1358 | 1354 | | |
1359 | 1355 | | |
1360 | | - | |
| 1356 | + | |
1361 | 1357 | | |
1362 | 1358 | | |
1363 | 1359 | | |
1364 | 1360 | | |
1365 | 1361 | | |
1366 | 1362 | | |
1367 | | - | |
1368 | 1363 | | |
1369 | 1364 | | |
1370 | 1365 | | |
| |||
0 commit comments