From ad03b409ab289ffd3d85a3bff44a57634ce55881 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 17 Mar 2014 14:42:24 +0100 Subject: [PATCH] make variable names more telling --- Extractor/PBFParser.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Extractor/PBFParser.cpp b/Extractor/PBFParser.cpp index 5849603d7..f229ae103 100644 --- a/Extractor/PBFParser.cpp +++ b/Extractor/PBFParser.cpp @@ -217,12 +217,15 @@ inline void PBFParser::parseDenseNode(_ThreadData * threadData) { #pragma omp parallel for schedule ( guided ) for(int i = 0; i < number_of_nodes; ++i) { - ImportNode &n = extracted_nodes_vector[i]; - ParseNodeInLua( n, scripting_environment.getLuaStateForThreadID(omp_get_thread_num()) ); + ImportNode & import_node = extracted_nodes_vector[i]; + ParseNodeInLua( + import_node, + scripting_environment.getLuaStateForThreadID(omp_get_thread_num()) + ); } - BOOST_FOREACH(const ImportNode &n, extracted_nodes_vector) { - extractor_callbacks->nodeFunction(n); + BOOST_FOREACH(const ImportNode &import_node, extracted_nodes_vector) { + extractor_callbacks->nodeFunction(import_node); } } @@ -349,18 +352,23 @@ inline void PBFParser::parseWay(_ThreadData * threadData) { #pragma omp parallel for schedule ( guided ) for(int i = 0; i < number_of_ways; ++i) { - ExtractionWay & w = parsed_way_vector[i]; - if(2 > w.path.size()) { + ExtractionWay & extraction_way = parsed_way_vector[i]; + if (2 > extraction_way.path.size()) + { continue; } - ParseWayInLua( w, scripting_environment.getLuaStateForThreadID( omp_get_thread_num()) ); + ParseWayInLua( + extraction_way, + scripting_environment.getLuaStateForThreadID( omp_get_thread_num()) + ); } - BOOST_FOREACH(ExtractionWay & w, parsed_way_vector) { - if(2 > w.path.size()) { + BOOST_FOREACH(ExtractionWay & extraction_way, parsed_way_vector) { + if (2 > extraction_way.path.size()) + { continue; } - extractor_callbacks->wayFunction(w); + extractor_callbacks->wayFunction(extraction_way); } }