diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
| commit | 71835d42df8fb488380be8cc89be4298b268902a (patch) | |
| tree | 7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/cpu/simple/atomic.hh | |
| parent | 2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff) | |
| parent | 4c7eb211191055f72c6f157913cb384f47cf4334 (diff) | |
| download | gem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz | |
Automated merge with file:/home/stever/hg/m5-orig
--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/cpu/simple/atomic.hh')
| -rw-r--r-- | src/cpu/simple/atomic.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh index f14dd6f99..19bc0e13b 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -68,7 +68,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU TickEvent(AtomicSimpleCPU *c); void process(); - const char *description(); + const char *description() const; }; TickEvent tickEvent; |