Commit a039e60
committed
Merge remote-tracking branch 'couchbase/morpheus' to master
* couchbase/morpheus:
MB-68823: Introduce ArenaMalloc::getCurrentClientArena()
CBD-6348: [BP] Fix TestRingBufferVector template constructor
CBD-6348: [BP] Update for C++20 compatibility
CBD-6348: [BP] Preparing for folly upgrade to v2022.02.14.00
CBD-6348: [BP] Fix building with fmt 10.1.0
CBD-6348: [BP] Remove deprecated format_to(memory_buffer) overload
Revert "MB-68823: Catch alloc/dealloc arena mismatch for NoClientIndex"
MB-68823: Catch alloc/dealloc arena mismatch for NoClientIndex
MB-68823: Allow to toggle ArenaMalloc debug checks dynamically
Change-Id: I42e06fa071c7300aa183664012812772ca26cee71 file changed
Lines changed: 12 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
41 | 46 | | |
42 | 47 | | |
43 | 48 | | |
| |||
57 | 62 | | |
58 | 63 | | |
59 | 64 | | |
60 | | - | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
275 | 280 | | |
276 | 281 | | |
277 | 282 | | |
278 | | - | |
| 283 | + | |
279 | 284 | | |
280 | 285 | | |
281 | 286 | | |
282 | 287 | | |
283 | 288 | | |
284 | 289 | | |
285 | | - | |
| 290 | + | |
286 | 291 | | |
287 | 292 | | |
288 | 293 | | |
| |||
429 | 434 | | |
430 | 435 | | |
431 | 436 | | |
432 | | - | |
| 437 | + | |
433 | 438 | | |
434 | 439 | | |
435 | 440 | | |
| |||
447 | 452 | | |
448 | 453 | | |
449 | 454 | | |
450 | | - | |
| 455 | + | |
451 | 456 | | |
452 | 457 | | |
453 | 458 | | |
| |||
0 commit comments