Merge branch 'xavery-stable-gcc611-fix-compile' into stable

This commit is contained in:
Fred Gleason 2016-05-24 13:26:26 -04:00
commit 2e7d160ef8

View File

@ -623,9 +623,10 @@ unsigned RDCartSlot::SelectCart(const QString &svcname,unsigned msecs)
"(SERVICE=\""+RDEscapeString(svcname)+"\")";
q=new RDSqlQuery(sql);
while(q->next()) {
if(::abs(msecs-q->value(1).toInt())<diff) {
int cur_diff = msecs-q->value(1).toInt();
if(::abs(cur_diff)<diff) {
cartnum=q->value(0).toUInt();
diff=::abs(msecs-q->value(1).toInt());
diff=::abs(cur_diff);
}
}
delete q;