Changeset 2a301ff for doc/papers/llheap/figures/ContainerNoOwnership.fig

Timestamp:

Aug 31, 2023, 11:31:15 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• doc/papers/llheap/figures/ContainerNoOwnership.fig (modified) (1 diff)

doc/papers/llheap/figures/ContainerNoOwnership.fig

@@ -11 +11 @@
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          1350 1200 1950 1200 1950 1500 1350 1500 1350 1200
-4 1 0 50 -1 0 11 0.0000 2 135 555 1650 1425 Header\001
+4 1 0 50 -1 0 10 0.0000 2 135 555 1650 1425 Header\001
 -6
 6 1800 1800 2700 2100
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          1950 1800 2550 1800 2550 2100 1950 2100 1950 1800
-4 1 0 50 -1 0 11 0.0000 2 195 765 2250 2025 Heap$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 195 765 2250 2025 Heap$_1$\001
 -6
 6 1800 1200 2700 1500
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          1950 1200 2550 1200 2550 1500 1950 1500 1950 1200
-4 1 0 50 -1 0 11 0.0000 2 195 870 2250 1425 Object$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 195 870 2250 1425 Object$_1$\001
 -6
 6 2400 1200 3300 1500
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          2550 1200 3150 1200 3150 1500 2550 1500 2550 1200
-4 1 0 50 -1 0 11 0.0000 2 195 870 2850 1425 Object$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 195 870 2850 1425 Object$_2$\001
 -6
 6 3000 1200 3900 1500
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          3150 1200 3750 1200 3750 1500 3150 1500 3150 1200
-4 1 0 50 -1 0 11 0.0000 2 195 870 3450 1425 Object$_3$\001
+4 1 0 50 -1 0 10 0.0000 2 195 870 3450 1425 Object$_3$\001
 -6
 6 2700 1800 3600 2100
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          2850 1800 3450 1800 3450 2100 2850 2100 2850 1800
-4 1 0 50 -1 0 11 0.0000 2 195 765 3150 2025 Heap$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 195 765 3150 2025 Heap$_2$\001
 -6
 6 3750 1200 4350 1500
 2 2 0 1 0 7 60 -1 17 0.000 0 0 -1 0 0 5
          3750 1200 4350 1200 4350 1500 3750 1500 3750 1200
-4 1 0 50 -1 0 11 0.0000 2 135 345 4050 1425 Free\001
+4 1 0 50 -1 0 10 0.0000 2 135 345 4050 1425 Free\001
 -6
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2