From cfd968dd94f35c5ef781be9bda883d8818fc1d6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 14:17:13 -0400 Subject: [PATCH] Fix stupid type error in calling std::max --- src/libstore/build.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 1840fb7b21..f93dd9b84a 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2898,7 +2898,7 @@ void Worker::waitForInput() if (lastWokenUp == 0) printMsg(lvlError, "waiting for locks or build slots..."); if (lastWokenUp == 0 || lastWokenUp > before) lastWokenUp = before; - timeout.tv_sec = std::max((time_t) 0, lastWokenUp + settings.pollInterval - before); + timeout.tv_sec = std::max((time_t) 0, (time_t) (lastWokenUp + settings.pollInterval - before)); } else lastWokenUp = 0; using namespace std;