From 7ce157d60f3b113c6ed570040f88c0d482f29e0c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 10 May 2012 10:09:30 -0700 Subject: [PATCH] utime_t: no double ctor MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit error: os/FileJournal.h:48:51: call of overloaded ‘utime_t(int)’ is ambiguous Signed-off-by: Sage Weil --- src/include/utime.h | 3 --- src/osdc/ObjectCacher.cc | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/include/utime.h b/src/include/utime.h index 3758fe65bb160..6953a9bcf6354 100644 --- a/src/include/utime.h +++ b/src/include/utime.h @@ -54,9 +54,6 @@ public: utime_t(const struct timeval *v) { set_from_timeval(v); } - explicit utime_t(double d) { - set_from_double(d); - } void to_timespec(struct timespec *ts) const { ts->tv_sec = tv.tv_sec; ts->tv_nsec = tv.tv_nsec; diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index b0187906625d7..13c1d60573c9c 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -415,11 +415,12 @@ ObjectCacher::ObjectCacher(CephContext *cct_, string name, WritebackHandler& wb, uint64_t max_size, uint64_t max_dirty, uint64_t target_dirty, double max_dirty_age) : perfcounter(NULL), cct(cct_), writeback_handler(wb), name(name), lock(l), - max_dirty(max_dirty), target_dirty(target_dirty), max_size(max_size), max_dirty_age(max_dirty_age), + max_dirty(max_dirty), target_dirty(target_dirty), max_size(max_size), flush_set_callback(flush_callback), flush_set_callback_arg(flush_callback_arg), flusher_stop(false), flusher_thread(this), stat_clean(0), stat_dirty(0), stat_rx(0), stat_tx(0), stat_missing(0), stat_dirty_waiting(0) { + this->max_dirty_age.set_from_double(max_dirty_age); perf_start(); } -- 2.39.5