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:
authorMaxim Pimenov <m@maps.me>2015-11-06 18:45:54 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:02:38 +0300
commitef97e8dbaf2356802381e96ef0f4ce61bced7616 (patch)
tree06c7fcbdc0627302163f1180f8eed5b6f15fe0c8 /indexer/trie_builder.hpp
parenta818bb4b37e4de58fe6a251c4a6cfcce53b34c6a (diff)
Review fixes.
Diffstat (limited to 'indexer/trie_builder.hpp')
-rw-r--r--indexer/trie_builder.hpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indexer/trie_builder.hpp b/indexer/trie_builder.hpp
index 6ba69c2430..7112e6b08d 100644
--- a/indexer/trie_builder.hpp
+++ b/indexer/trie_builder.hpp
@@ -49,15 +49,18 @@ void WriteNode(TSink & sink, TSerializer const & serializer, TrieChar baseChar,
uint32_t const valueCount = valueList.Size();
if (begChild == endChild && !isRoot)
{
- // Leaf node.
+// Leaf node.
#ifdef DEBUG
auto posBefore = sink.Pos();
#endif
+
valueList.Serialize(sink, serializer);
+
#ifdef DEBUG
if (valueCount == 0)
ASSERT_EQUAL(sink.Pos(), posBefore, ("Empty valueList must produce an empty serialization."));
#endif
+
return;
}
uint32_t const childCount = endChild - begChild;
@@ -215,7 +218,8 @@ void AppendValue(TNodeInfo & node, TValue const & value)
// sorted order and we can avoid sorting them before doing
// further operations such as ValueList construction.
using namespace std::rel_ops;
- ASSERT(node.m_temporaryValueList.empty() || node.m_temporaryValueList.back() <= value, ());
+ ASSERT(node.m_temporaryValueList.empty() || node.m_temporaryValueList.back() <= value,
+ (node.m_temporaryValueList.size()));
if (!node.m_temporaryValueList.empty() && node.m_temporaryValueList.back() == value)
return;
if (node.m_mayAppend)