aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-04-07 00:50:18 +0000
committerlloyd <[email protected]>2008-04-07 00:50:18 +0000
commit4191064d79916508e531c4f28ddb244527f64d5c (patch)
tree11154c9ca43e8484840602e00f8c44ec31e25e94
parentd5152bdccb28ae6286cac29b57199f7e58159608 (diff)
Timer::combine_timers should be protected, not private, since subclasses need
to access it.
-rw-r--r--include/timers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/timers.h b/include/timers.h
index afdbc7f21..9c836f064 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -18,7 +18,7 @@ class Timer
public:
virtual u64bit clock() const;
virtual ~Timer() {}
- private:
+ protected:
static u64bit combine_timers(u32bit, u32bit, u32bit);
};