Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

use proper interface of HashTable, use prefix increment

Browse Source
This commit is contained in:
Dennis Luxen 2014-06-23 12:13:01 +02:00
parent eac7d07ef6
commit f99f194927
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Extractor/PBFParser.cpp
View File

@ -267,7 +267,7 @@ inline void PBFParser::parseDenseNode(ParserThreadData *thread_data)
const int keyValue = dense.keys_vals(denseTagIndex + 1); const int keyValue = dense.keys_vals(denseTagIndex + 1);
const std::string &key = thread_data->PBFprimitiveBlock.stringtable().s(tagValue); const std::string &key = thread_data->PBFprimitiveBlock.stringtable().s(tagValue);
const std::string &value = thread_data->PBFprimitiveBlock.stringtable().s(keyValue); 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; denseTagIndex += 2;
} }
} }
@ -276,7 +276,7 @@ inline void PBFParser::parseDenseNode(ParserThreadData *thread_data)
[this, &extracted_nodes_vector](const tbb::blocked_range<size_t>& range) [this, &extracted_nodes_vector](const tbb::blocked_range<size_t>& range)
{ {
lua_State* lua_state = this->scripting_environment.getLuaState(); 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]; ImportNode &import_node = extracted_nodes_vector[i];
ParseNodeInLua(import_node, lua_state); 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)); thread_data->PBFprimitiveBlock.stringtable().s(input_way.keys(j));
const std::string &val = const std::string &val =
thread_data->PBFprimitiveBlock.stringtable().s(input_way.vals(j)); 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));
} }
} }