Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence VC10 warnings

Browse Source
This commit is contained in:
Siana Gearz
2013-05-26 05:43:28 +02:00
parent bd2b25b12b
commit bc145c95fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/aicurlthread.cpp
View File

@@ -2673,21 +2673,21 @@ AIPerService::Approvement* AIPerService::approveHTTPRequestFor(AIPerServicePtr c
PerService_wat per_service_w(*per_service); PerService_wat per_service_w(*per_service);
CapabilityType& ct(per_service_w->mCapabilityType[capability_type]); CapabilityType& ct(per_service_w->mCapabilityType[capability_type]);
S32 const pipelined_requests_per_capability_type = ct.pipelined_requests(); S32 const pipelined_requests_per_capability_type = ct.pipelined_requests();
reject = pipelined_requests_per_capability_type >= ct.mMaxPipelinedRequests; reject = pipelined_requests_per_capability_type >= (S32)ct.mMaxPipelinedRequests;
equal = pipelined_requests_per_capability_type == ct.mMaxPipelinedRequests; equal = pipelined_requests_per_capability_type == ct.mMaxPipelinedRequests;
increment_threshold = ct.mFlags & ctf_starvation; increment_threshold = ct.mFlags & ctf_starvation;
decrement_threshold = (ct.mFlags & (ctf_empty | ctf_full)) == ctf_full; decrement_threshold = (ct.mFlags & (ctf_empty | ctf_full)) == ctf_full;
ct.mFlags = 0; ct.mFlags = 0;
if (decrement_threshold) if (decrement_threshold)
{ {
if (ct.mMaxPipelinedRequests > per_service_w->mConcurrectConnections) if ((int)ct.mMaxPipelinedRequests > per_service_w->mConcurrectConnections)
{ {
ct.mMaxPipelinedRequests--; ct.mMaxPipelinedRequests--;
} }
} }
else if (increment_threshold && reject) else if (increment_threshold && reject)
{ {
if (ct.mMaxPipelinedRequests < 2 * per_service_w->mConcurrectConnections) if ((int)ct.mMaxPipelinedRequests < 2 * per_service_w->mConcurrectConnections)
{ {
ct.mMaxPipelinedRequests++; ct.mMaxPipelinedRequests++;
// Immediately take the new threshold into account. // Immediately take the new threshold into account.