puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix stupid type error in calling std::max

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-27 14:17:13 -04:00
parent f3077fd88d
commit cfd968dd94
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -2898,7 +2898,7 @@ void Worker::waitForInput()
if (lastWokenUp == 0) if (lastWokenUp == 0)
printMsg(lvlError, "waiting for locks or build slots..."); printMsg(lvlError, "waiting for locks or build slots...");
if (lastWokenUp == 0 || lastWokenUp > before) lastWokenUp = before; 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; } else lastWokenUp = 0;
using namespace std; using namespace std;