summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/System.hh
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2009-07-18 17:40:20 -0500
committerDerek Hower <drh5@cs.wisc.edu>2009-07-18 17:40:20 -0500
commit926ab6e6dbc2417f6c103512481a60e64be4fea8 (patch)
treed8598dd4a0841928729ebde1f0b00882e6498604 /src/mem/ruby/system/System.hh
parent4b7ea4cb510465bc82c6679407d5a125cfddd18c (diff)
parentd85cd08113e61817fdf1df978f2713ba8b094996 (diff)
downloadgem5-926ab6e6dbc2417f6c103512481a60e64be4fea8.tar.xz
merge
Diffstat (limited to 'src/mem/ruby/system/System.hh')
-rw-r--r--src/mem/ruby/system/System.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 40c425ad7..8cbeb2b0e 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -106,7 +106,7 @@ public:
static int getNumberOfSequencers() { return m_sequencers.size(); }
Profiler* getProfiler() {assert(m_profiler_ptr != NULL); return m_profiler_ptr; }
- Tracer* getTracer() { assert(m_tracer_ptr != NULL); return m_tracer_ptr; }
+ static Tracer* getTracer() { assert(m_tracer_ptr != NULL); return m_tracer_ptr; }
static MemoryVector* getMemoryVector() { assert(m_mem_vec_ptr != NULL); return m_mem_vec_ptr;}
void recordCacheContents(CacheRecorder& tr) const;