diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-15 17:41:37 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-15 17:41:37 -0400 |
commit | 4c3e01bd906a7be2b7c73515c8f0f00be1276a70 (patch) | |
tree | 12c0e22066f09f6aafd2b768d1f16171351f27a9 /src/sim/system.hh | |
parent | 890f0fc782b939a72c907ebf49866c634cfa3454 (diff) | |
parent | ed58f77c473cf6f35a17ba1448a12dbca089987d (diff) | |
download | gem5-4c3e01bd906a7be2b7c73515c8f0f00be1276a70.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/tmp/m5.newmem
--HG--
extra : convert_revision : d490a68eeabd0da7cd9791e14ca3678ed0fd31e6
Diffstat (limited to 'src/sim/system.hh')
-rw-r--r-- | src/sim/system.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sim/system.hh b/src/sim/system.hh index c138d2ee4..11f4f0c90 100644 --- a/src/sim/system.hh +++ b/src/sim/system.hh @@ -141,7 +141,7 @@ class System : public SimObject * up in the specified symbol table. */ template <class T> - T *System::addFuncEvent(SymbolTable *symtab, const char *lbl) + T *addFuncEvent(SymbolTable *symtab, const char *lbl) { Addr addr = 0; // initialize only to avoid compiler warning @@ -155,7 +155,7 @@ class System : public SimObject /** Add a function-based event to kernel code. */ template <class T> - T *System::addKernelFuncEvent(const char *lbl) + T *addKernelFuncEvent(const char *lbl) { return addFuncEvent<T>(kernelSymtab, lbl); } |