From f99f1949277624b224f8a36cc4fe5487b7b2ce3c Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 23 Jun 2014 12:13:01 +0200 Subject: [PATCH] use proper interface of HashTable, use prefix increment --- Extractor/PBFParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Extractor/PBFParser.cpp b/Extractor/PBFParser.cpp index 4ad8ba617..3b165c672 100644 --- a/Extractor/PBFParser.cpp +++ b/Extractor/PBFParser.cpp @@ -267,7 +267,7 @@ inline void PBFParser::parseDenseNode(ParserThreadData *thread_data) const int keyValue = dense.keys_vals(denseTagIndex + 1); const std::string &key = thread_data->PBFprimitiveBlock.stringtable().s(tagValue); const std::string &value = thread_data->PBFprimitiveBlock.stringtable().s(keyValue); - extracted_nodes_vector[i].keyVals.emplace(key, value); + extracted_nodes_vector[i].keyVals.Add(std::move(key), std::move(value)); denseTagIndex += 2; } } @@ -276,7 +276,7 @@ inline void PBFParser::parseDenseNode(ParserThreadData *thread_data) [this, &extracted_nodes_vector](const tbb::blocked_range& range) { lua_State* lua_state = this->scripting_environment.getLuaState(); - for (size_t i = range.begin(); i != range.end(); i++) + for (size_t i = range.begin(); i != range.end(); ++i) { ImportNode &import_node = extracted_nodes_vector[i]; ParseNodeInLua(import_node, lua_state); @@ -436,7 +436,7 @@ inline void PBFParser::parseWay(ParserThreadData *thread_data) thread_data->PBFprimitiveBlock.stringtable().s(input_way.keys(j)); const std::string &val = thread_data->PBFprimitiveBlock.stringtable().s(input_way.vals(j)); - parsed_way_vector[i].keyVals.emplace(key, val); + parsed_way_vector[i].keyVals.Add(std::move(key), std::move(val)); } }