diff options
author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:38 -0500 |
---|---|---|
committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:38 -0500 |
commit | c3551e82f7087a0c0398ef037c979e0cc24d51ca (patch) | |
tree | 9118f6142c19a24375986f1ed3dde79d89725749 /src/arch | |
parent | 18b147acef164dcc7faa3a6c184c913a2bbb93fa (diff) | |
download | gem5-c3551e82f7087a0c0398ef037c979e0cc24d51ca.tar.xz |
arch: Fix broken M5VarArgsFault initialization
At least gcc 4.4.3 seems to get confused by the use of func both as a
template parameter and a member variable in the M5VarArgsFault
class. This causes the value of the member variable func to be
unpredictable in M5VarArgsFault objects. This changeset renames the
template parameter to remove this ambiguity.
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/generic/debugfaults.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh index 2a10ced92..c42f87c25 100644 --- a/src/arch/generic/debugfaults.hh +++ b/src/arch/generic/debugfaults.hh @@ -108,12 +108,12 @@ class M5DebugFault : public FaultBase } }; -template <int func> +template <int Func> class M5VarArgsFault : public M5DebugFault { public: M5VarArgsFault(const std::string &format, CPRINTF_DECLARATION) : - M5DebugFault((DebugFunc)func, csprintf(format, VARARGS_ALLARGS)) + M5DebugFault((DebugFunc)Func, csprintf(format, VARARGS_ALLARGS)) {} }; |