diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-10 20:06:44 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-10 20:06:44 -0500 |
| commit | f2e97427be8e0787301ac83b05a7cac2bf2424db (patch) | |
| tree | e71d068328bbee0959577220ebc614f9daa2d71a /base/intmath.hh | |
| parent | 3923eec0ef46dd1ce7ed2ef0cbc68419a0161796 (diff) | |
| parent | ac6240896e26dd709dc17298ba093d32860b947f (diff) | |
| download | gem5-f2e97427be8e0787301ac83b05a7cac2bf2424db.tar.xz | |
Merge zizzer:/bk/m5
into pb15.local:/Users/ali/work/m5.head
--HG--
extra : convert_revision : b8631bcea38e3a75e4442927500ddfc7763ba9cf
Diffstat (limited to 'base/intmath.hh')
| -rw-r--r-- | base/intmath.hh | 16 |
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) |