Ignore:
Timestamp:
May 1, 2023, 4:19:09 PM (20 months ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
c083c3d
Parents:
a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/theses/mike_brooks_MMath/benchmarks/list/op-queue-insfirst-remelem.h

    ra50fdfb r6e1e2d0  
    33// remelem:  removes happen via an element-level operation and inserts happen via the api-provided "first"/"head"/"front"
    44
    5 #define BOP_TEARDOWN(lst, ui, iters, i) BFX_REMOVE_LAST(B_UserItem, lst)
     5#define BOP_TEARDOWN(lst, iters, remNo)      BFX_REMOVE_LAST(B_UserItem, lst)
    66
    7 #define BOP_INSERT(lst, ui, iters, i) BFX_INSERT_FIRST(B_UserItem, lst, ui[i])
    8 #define BOP_REMOVE(lst, ui, iters, i) BFX_REMOVE_HERE(B_UserItem, lst, iters[i])
     7#define BOP_INSERT(lst, iters, insNo, item)  BFX_INSERT_FIRST(B_UserItem, lst, (item))
     8#define BOP_REMOVE(lst, iters, remNo)        BFX_REMOVE_HERE(B_UserItem, lst, iters[(remNo)])
Note: See TracChangeset for help on using the changeset viewer.