From e3eecdae17dd4adc09e19da9b232f5f06846a567 Mon Sep 17 00:00:00 2001 From: Josh Watzman Date: Thu, 7 May 2015 09:41:25 -0700 Subject: [PATCH] Tweak explicit std::max instantiation Summary: Per discussion on D2040509 this is better. Test Plan: Still builds. Reviewed By: yfeldblum@fb.com Subscribers: folly-diffs@, yfeldblum, chalfant FB internal diff: D2051099 Signature: t1:2051099:1430949575:cc167b57f2d6ff42a73dee4e65d22d04932bb279 Blame Revision: rFBCODE9bdb427be1ef80b612e4f364db7809c6351cfe1c --- folly/experimental/fibers/EventBaseLoopController-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/folly/experimental/fibers/EventBaseLoopController-inl.h b/folly/experimental/fibers/EventBaseLoopController-inl.h index 363cef2f..42158dd2 100644 --- a/folly/experimental/fibers/EventBaseLoopController-inl.h +++ b/folly/experimental/fibers/EventBaseLoopController-inl.h @@ -98,7 +98,7 @@ inline void EventBaseLoopController::timedSchedule(std::function func, auto delay_ms = std::chrono::duration_cast< std::chrono::milliseconds>(time - Clock::now()).count() + 1; // If clock is not monotonic - delay_ms = std::max(delay_ms, 0L); + delay_ms = std::max(delay_ms, 0L); eventBase_->tryRunAfterDelay(func, delay_ms); } -- 2.34.1