summaryrefslogtreecommitdiff
path: root/base/intmath.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-12 11:38:26 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-12 11:38:26 -0500
commit94590a4dba6712ae61bfed260d7933b58b78c449 (patch)
treecbde4c0a95ab6e064649ec9ffd474a43fdd9b24e /base/intmath.hh
parentb0700182662df6050c5baf46ea6bae2835b55a78 (diff)
parent79613686f0f6a8725e88e935a7c9ff4ede4cfc2b (diff)
downloadgem5-94590a4dba6712ae61bfed260d7933b58b78c449.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch --HG-- extra : convert_revision : 427b5c957f91e66271444acebc01e1a861790363
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)