Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2015-10-29 15:24:41 +0300
committerr.kuznetsov <r.kuznetsov@corp.mail.ru>2015-11-30 16:26:54 +0300
commit5d35ecef20dafb3d81f6ae44adca8a3b470bfd4d (patch)
treea2f47407ca24b1818d2de2ac0541b56749a081f3 /indexer/cell_id.hpp
parent139cfd00d471629ad298ceb4bfbc8f3e6dd0e31f (diff)
Added additional debug checks.
Diffstat (limited to 'indexer/cell_id.hpp')
-rw-r--r--indexer/cell_id.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indexer/cell_id.hpp b/indexer/cell_id.hpp
index d9babb1378..6d9a014366 100644
--- a/indexer/cell_id.hpp
+++ b/indexer/cell_id.hpp
@@ -68,12 +68,12 @@ public:
id2 = id2.Parent();
}
#if 0 // DEBUG
- CoordT minX, minY, maxX, maxY;
+ double minX, minY, maxX, maxY;
GetCellBounds(id1, minX, minY, maxX, maxY);
- ASSERT(minX <= x1 && x1 <= maxX, (x1, y1, x2, y2, id1, minX, minY, maxX, maxY));
- ASSERT(minX <= x2 && x2 <= maxX, (x1, y1, x2, y2, id1, minX, minY, maxX, maxY));
- ASSERT(minY <= y1 && y1 <= maxY, (x1, y1, x2, y2, id1, minX, minY, maxX, maxY));
- ASSERT(minY <= y2 && y2 <= maxY, (x1, y1, x2, y2, id1, minX, minY, maxX, maxY));
+ ASSERT(my::between_s(minX, maxX, x1), (x1, minX, maxX));
+ ASSERT(my::between_s(minX, maxX, x2), (x2, minX, maxX));
+ ASSERT(my::between_s(minY, maxY, y1), (y1, minY, maxY));
+ ASSERT(my::between_s(minY, maxY, y2), (y2, minY, maxY));
#endif
return id1;
}