86,91d85
< // called by Ruby when transaction completes
< void writeConflictCallback(const Address& address);
< void readConflictCallback(const Address& address);
< void writeConflictCallback(const Address& address, GenericMachineType respondingMach, int thread);
< void readConflictCallback(const Address& address, GenericMachineType respondingMach, int thread);
<
134c128
< void conflictCallback(const CacheMsg& request, GenericMachineType respondingMach, int thread);
---
> // void conflictCallback(const CacheMsg& request, GenericMachineType respondingMach, int thread);