Merged upstream/master

This commit is contained in:
Drake Arconis
2014-08-22 10:26:58 -04:00
18 changed files with 86 additions and 63 deletions

View File

@@ -610,7 +610,7 @@ void AIPerService::purge(void)
per_service_w->mCapabilityType[i].mQueuedRequests.clear();
if (is_approved((AICapabilityType)i))
{
llassert(total_queued_w->approved >= s);
llassert(total_queued_w->approved >= (S32)s);
total_queued_w->approved -= s;
}
}