summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2005-12-23 13:50:35 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2005-12-23 13:50:35 -0500
commit16bda9c03eb79e223f3cbc03ef80e75b7e27f266 (patch)
tree98945ca6abb9bac48dd19e8406bf0a90c7e13631 /base
parent0cdcb08d908bc20f614dd164f8e43287406e81a3 (diff)
downloadgem5-16bda9c03eb79e223f3cbc03ef80e75b7e27f266.tar.xz
Fix roundUp function template so explicit arg is not
needed in a few more cases. base/intmath.hh: align arg to roundUp should be int, not template class sim/process.cc: sim/syscall_emul.hh: No need for explicit template arg now that roundUp is fixed. --HG-- extra : convert_revision : f9f4639e022acb9f427e8d30d81c782504437c53
Diffstat (limited to 'base')
-rw-r--r--base/intmath.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/intmath.hh b/base/intmath.hh
index 3922a326b..c8b9c5ec5 100644
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -194,9 +194,9 @@ divCeil(T a, T b)
template <class T>
inline T
-roundUp(T val, T align)
+roundUp(T val, int align)
{
- T mask = align - 1;
+ T mask = (T)align - 1;
return (val + mask) & ~mask;
}