summaryrefslogtreecommitdiff
path: root/base/intmath.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-02-10 14:38:15 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-02-10 14:38:15 -0500
commita86a3fa525caa3f063e94a042545131c7e61d5b6 (patch)
treeb5ade6e99258d47d57209bf84914b9c2acc2f5c4 /base/intmath.hh
parentfb90b1dd13fb6c0090bfe2731ca9ccee56479761 (diff)
parentfb7899aa681001d2af7837eae7bf0e19fd3e1b02 (diff)
downloadgem5-a86a3fa525caa3f063e94a042545131c7e61d5b6.tar.xz
Merge zizzer:/bk/m5
into udhcp-macvpn-776.public.engin.umich.edu:/Users/ali/work/m5.head --HG-- extra : convert_revision : e9ffaa1d4b7eee1f5bd0c492e162aac1e0806099
Diffstat (limited to 'base/intmath.hh')
-rw-r--r--base/intmath.hh16
1 files changed, 0 insertions, 16 deletions
diff --git a/base/intmath.hh b/base/intmath.hh
index c8b9c5ec5..df0687c62 100644
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -145,22 +145,6 @@ floorLog2(long long x)
return floorLog2((unsigned long long)x);
}
-#if defined(__APPLE__)
-inline int
-floorLog2(size_t x)
-{
- assert(x > 0);
- assert(sizeof(size_t) == 4 || sizeof(size_t) == 8);
-
- // It's my hope that this is optimized away?
- if (sizeof(size_t) == 4)
- return floorLog2((uint32_t)x);
- else if (sizeof(size_t) == 8)
- return floorLog2((uint64_t)x);
-
-}
-#endif
-
template <class T>
inline int
ceilLog2(T n)