Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

[gem5.git] / base / intmath.hh

diff --git a/base/intmath.hh b/base/intmath.hh
index 821514668840560f5fe8234cabfa40cc58a49d7b..5ffe2710393c78cd5d746f4e3a60f42f6d19caf0 100644 (file)
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -120,7 +120,7 @@ FloorLog2(int64_t x)
 }
 
 #if defined(__APPLE__)
-int
+inline int
 FloorLog2(size_t x)
 {
     assert(x > 0);