diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·17-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T18·17-0400 |
commit | cfd968dd94f35c5ef781be9bda883d8818fc1d6e (patch) | |
tree | 75691af171c25b098dc2f7d68eb7dd52d91ca8bd /src/libstore | |
parent | f3077fd88d6ec8f05a5471687f23589e34dfeaeb (diff) |
Fix stupid type error in calling std::max
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 1840fb7b21bc..f93dd9b84a82 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; |