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:
authorYury Melnichek <melnichek@gmail.com>2011-09-11 15:59:00 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:23:43 +0300
commitd8d6c2e5331026d950efec9bf1409ea27c789a81 (patch)
treec5b7bbea13caddf3f25651d1be3005ea134a8fc0 /indexer/interval_index.hpp
parent4d56813e90f79ba0468cec3ceb448f214988a405 (diff)
CellId refactoring: explicitly specify DEPTH_LEVELS where needed.
Diffstat (limited to 'indexer/interval_index.hpp')
-rw-r--r--indexer/interval_index.hpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp
index 61d7b330bb..53faf3c590 100644
--- a/indexer/interval_index.hpp
+++ b/indexer/interval_index.hpp
@@ -66,8 +66,12 @@ public:
{
if (m_Header.m_Levels != 0 && beg != end)
{
- ASSERT_LESS_OR_EQUAL(beg, KeyEnd(), (end));
- ASSERT_LESS_OR_EQUAL(end, KeyEnd(), (beg));
+ // ASSERT_LESS_OR_EQUAL(beg, KeyEnd(), (end));
+ // ASSERT_LESS_OR_EQUAL(end, KeyEnd(), (beg));
+ if (beg > KeyEnd())
+ beg = KeyEnd();
+ if (end > KeyEnd())
+ end = KeyEnd();
--end; // end is inclusive in ForEachImpl().
ForEachNode(f, beg, end, m_Header.m_Levels, 0,
m_LevelOffsets[m_Header.m_Levels + 1] - m_LevelOffsets[m_Header.m_Levels]);