128c128
< Request::Flags flags, AtomicOpFunctor *amo_op)
---
> Request::Flags flags, AtomicOpFunctor *_amo_op)
130c130
< assert(amo_op);
---
> assert(_amo_op);
134a135
> AtomicOpFunctorPtr amo_op = AtomicOpFunctorPtr(_amo_op);
136c137
< amo_op);
---
> std::move(amo_op));
150c151
< Request::Flags flags, AtomicOpFunctor *amo_op)
---
> Request::Flags flags, AtomicOpFunctor *_amo_op)
152,153c153,155
< assert(amo_op);
< return xc->initiateMemAMO(addr, sizeof(MemT), flags, amo_op);
---
> assert(_amo_op);
> AtomicOpFunctorPtr amo_op = AtomicOpFunctorPtr(_amo_op);
> return xc->initiateMemAMO(addr, sizeof(MemT), flags, std::move(amo_op));