diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
commit | aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d (patch) | |
tree | f48c9d361d04cc6276ef33a9898eb0ac61de36d7 /cpu/static_inst.cc | |
parent | 783f701247a1013a32d7caab324660c211215a11 (diff) | |
parent | f31a27a030d2e93fef2934aa8642609bb38974af (diff) | |
download | gem5-aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d.tar.xz |
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Diffstat (limited to 'cpu/static_inst.cc')
-rw-r--r-- | cpu/static_inst.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/static_inst.cc b/cpu/static_inst.cc index 4cb45a818..7069d89ec 100644 --- a/cpu/static_inst.cc +++ b/cpu/static_inst.cc @@ -85,4 +85,4 @@ StaticInst<ISA>::hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt) // force instantiation of template function(s) above -template StaticInst<AlphaISA>; +template class StaticInst<AlphaISA>; |