mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

elim warnings on visualc++ and a couple asserts

Browse Source
This commit is contained in:
dwight 2011-05-06 17:07:32 -04:00
parent 0c5c2b49d2
commit a9faaa2b08
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
db/geo/2d.cpp
View File

@ -1306,7 +1306,11 @@ namespace mongo {
#endif
if( maxToAdd < 0 ) maxToAdd = maxToCheck;
int maxFound = _foundInExp + maxToCheck;
int maxAdded = _found + maxToAdd;
assert( maxToCheck > 0 );
assert( maxFound > 0 );
assert( _found <= 0x7fffffff ); // conversion to int
int maxAdded = static_cast<int>(_found) + maxToAdd;
assert( maxAdded >= 0 ); // overflow check
bool isNeighbor = _centerPrefix.constrains();
@ -1480,7 +1484,8 @@ namespace mongo {
assert( ! onlyExpand );
fillStack( maxFound - _foundInExp, maxAdded - _found );
assert( _found <= 0x7fffffff );
fillStack( maxFound - _foundInExp, maxAdded - static_cast<int>(_found) );
// When we return from the recursive fillStack call, we'll either have checked enough points or
// be entirely done. Max recurse depth is < 8 * 16.
@ -1756,7 +1761,9 @@ namespace mongo {
// Part 1
{
do {
fillStack( maxPointsHeuristic, _numWanted - found() , true );
long long f = found();
assert( f <= 0x7fffffff );
fillStack( maxPointsHeuristic, _numWanted - static_cast<int>(f) , true );
} while( _state != DONE && _state != DONE_NEIGHBOR &&
found() < _numWanted &&
(! _prefix.constrains() || _g->sizeEdge( _prefix ) <= _scanDistance ) );