summaryrefslogtreecommitdiff
path: root/src/cpu/o3/inst_queue.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2008-02-11 08:31:26 -0800
committerSteve Reinhardt <stever@gmail.com>2008-02-11 08:31:26 -0800
commit71835d42df8fb488380be8cc89be4298b268902a (patch)
tree7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/cpu/o3/inst_queue.hh
parent2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff)
parent4c7eb211191055f72c6f157913cb384f47cf4334 (diff)
downloadgem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz
Automated merge with file:/home/stever/hg/m5-orig
--HG-- extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/cpu/o3/inst_queue.hh')
-rw-r--r--src/cpu/o3/inst_queue.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 9d7c457ca..d0f503977 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -105,7 +105,7 @@ class InstructionQueue
InstructionQueue<Impl> *iq_ptr);
virtual void process();
- virtual const char *description();
+ virtual const char *description() const;
void setFreeFU() { freeFU = true; }
};