From 8204c7dacf17851057dda165e6d1638cbff70cbf Mon Sep 17 00:00:00 2001 From: Mathias Stearn Date: Fri, 30 Jun 2017 14:09:35 -0400 Subject: SERVER-29887 address clang-4.0 warnings in geo code --- src/mongo/db/geo/r2_region_coverer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/mongo/db/geo') diff --git a/src/mongo/db/geo/r2_region_coverer.cpp b/src/mongo/db/geo/r2_region_coverer.cpp index 47ba2528328..4d7791dc1e3 100644 --- a/src/mongo/db/geo/r2_region_coverer.cpp +++ b/src/mongo/db/geo/r2_region_coverer.cpp @@ -68,15 +68,13 @@ R2RegionCoverer::R2RegionCoverer(GeoHashConverter* hashConverter) R2RegionCoverer::~R2RegionCoverer() {} void R2RegionCoverer::setMinLevel(unsigned int minLevel) { - dassert(minLevel >= 0); dassert(minLevel <= GeoHash::kMaxBits); - _minLevel = max(0u, min(GeoHash::kMaxBits, minLevel)); + _minLevel = min(GeoHash::kMaxBits, minLevel); } void R2RegionCoverer::setMaxLevel(unsigned int maxLevel) { - dassert(maxLevel >= 0); dassert(maxLevel <= GeoHash::kMaxBits); - _maxLevel = max(0u, min(GeoHash::kMaxBits, maxLevel)); + _maxLevel = min(GeoHash::kMaxBits, maxLevel); } void R2RegionCoverer::setMaxCells(int maxCells) { -- cgit v1.2.1