From 2a642975064a966010349197bbc9969492731bc6 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 6 Mar 2014 18:07:55 +0100 Subject: [PATCH] Forward decl to cut compile times --- Extractor/ExtractionHelperFunctions.h | 16 ++++++++-------- Extractor/ExtractorCallbacks.cpp | 18 +++++++----------- Extractor/ExtractorCallbacks.h | 8 +++----- Extractor/PBFParser.cpp | 1 + Extractor/PBFParser.h | 12 ++++++------ Extractor/XMLParser.cpp | 2 ++ Extractor/XMLParser.h | 5 ++--- 7 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Extractor/ExtractionHelperFunctions.h b/Extractor/ExtractionHelperFunctions.h index c0b74bdb3..d284efdd7 100644 --- a/Extractor/ExtractionHelperFunctions.h +++ b/Extractor/ExtractionHelperFunctions.h @@ -75,13 +75,13 @@ inline unsigned parseDuration(const std::string &s) { return UINT_MAX; } -inline int parseMaxspeed(std::string input) { //call-by-value on purpose. - boost::algorithm::to_lower(input); - int n = stringToInt(input); - if (input.find("mph") != std::string::npos || input.find("mp/h") != std::string::npos) { - n = (n*1609)/1000; - } - return n; -} +// inline int parseMaxspeed(std::string input) { //call-by-value on purpose. +// boost::algorithm::to_lower(input); +// int n = stringToInt(input); +// if (input.find("mph") != std::string::npos || input.find("mp/h") != std::string::npos) { +// n = (n*1609)/1000; +// } +// return n; +// } #endif /* EXTRACTIONHELPERFUNCTIONS_H_ */ diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index 0dc5ac8aa..9ac9cb1cb 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -28,32 +28,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ExtractorCallbacks.h" #include "ExtractionContainers.h" -#include "ExtractionHelperFunctions.h" #include "ExtractionWay.h" #include "../DataStructures/Restriction.h" +#include "../DataStructures/ImportNode.h" #include "../Util/SimpleLogger.h" #include -#include -#include -#include - #include #include ExtractorCallbacks::ExtractorCallbacks() : - stringMap(NULL), + string_map(NULL), externalMemory(NULL) { } ExtractorCallbacks::ExtractorCallbacks( ExtractionContainers * ext, - StringMap * strMap + boost::unordered_map * string_map ) : - stringMap(strMap), + string_map(string_map), externalMemory(ext) { } @@ -93,11 +89,11 @@ void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) { } //Get the unique identifier for the street name - const StringMap::const_iterator & string_map_iterator = stringMap->find(parsed_way.name); - if(stringMap->end() == string_map_iterator) { + const boost::unordered_map::const_iterator & string_map_iterator = string_map->find(parsed_way.name); + if(string_map->end() == string_map_iterator) { parsed_way.nameID = externalMemory->name_list.size(); externalMemory->name_list.push_back(parsed_way.name); - stringMap->insert(std::make_pair(parsed_way.name, parsed_way.nameID)); + string_map->insert(std::make_pair(parsed_way.name, parsed_way.nameID)); } else { parsed_way.nameID = string_map_iterator->second; } diff --git a/Extractor/ExtractorCallbacks.h b/Extractor/ExtractorCallbacks.h index 555d19a12..3a27b6ed8 100644 --- a/Extractor/ExtractorCallbacks.h +++ b/Extractor/ExtractorCallbacks.h @@ -28,29 +28,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTORCALLBACKS_H_ #define EXTRACTORCALLBACKS_H_ -#include "ExtractorStructs.h" #include "../typedefs.h" #include #include +struct ExternalMemoryNode; class ExtractionContainers; struct ExtractionWay; struct InputRestrictionContainer; -typedef boost::unordered_map StringMap; - class ExtractorCallbacks{ private: - StringMap * stringMap; + boost::unordered_map * string_map; ExtractionContainers * externalMemory; ExtractorCallbacks(); public: explicit ExtractorCallbacks( ExtractionContainers * ext, - StringMap * strMap + boost::unordered_map * string_map ); ~ExtractorCallbacks(); diff --git a/Extractor/PBFParser.cpp b/Extractor/PBFParser.cpp index f229ae103..003552885 100644 --- a/Extractor/PBFParser.cpp +++ b/Extractor/PBFParser.cpp @@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ScriptingEnvironment.h" #include "../DataStructures/HashTable.h" +#include "../DataStructures/ImportNode.h" #include "../DataStructures/Restriction.h" #include "../Util/MachineInfo.h" #include "../Util/OpenMPWrapper.h" diff --git a/Extractor/PBFParser.h b/Extractor/PBFParser.h index 91c89157b..e67a845b8 100644 --- a/Extractor/PBFParser.h +++ b/Extractor/PBFParser.h @@ -76,13 +76,13 @@ public: private: inline void ReadData(); inline void ParseData(); - inline void parseDenseNode (_ThreadData * threadData); - inline void parseNode (_ThreadData * threadData); - inline void parseRelation (_ThreadData * threadData); - inline void parseWay (_ThreadData * threadData); + inline void parseDenseNode (_ThreadData * threadData); + inline void parseNode (_ThreadData * threadData); + inline void parseRelation (_ThreadData * threadData); + inline void parseWay (_ThreadData * threadData); - inline void loadGroup (_ThreadData * threadData); - inline void loadBlock (_ThreadData * threadData); + inline void loadGroup (_ThreadData * threadData); + inline void loadBlock (_ThreadData * threadData); inline bool readPBFBlobHeader(std::fstream & stream, _ThreadData * threadData); inline bool unpackZLIB (std::fstream & stream, _ThreadData * threadData); inline bool unpackLZMA (std::fstream & stream, _ThreadData * threadData); diff --git a/Extractor/XMLParser.cpp b/Extractor/XMLParser.cpp index 26c31ebd2..2fdcb6a6e 100644 --- a/Extractor/XMLParser.cpp +++ b/Extractor/XMLParser.cpp @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "XMLParser.h" #include "ExtractionWay.h" +#include "ExtractorCallbacks.h" + #include "../DataStructures/HashTable.h" #include "../DataStructures/ImportNode.h" #include "../DataStructures/InputReaderFactory.h" diff --git a/Extractor/XMLParser.h b/Extractor/XMLParser.h index 9e307fcc1..7c88d48a7 100644 --- a/Extractor/XMLParser.h +++ b/Extractor/XMLParser.h @@ -33,13 +33,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include - class XMLParser : public BaseParser { public: XMLParser( const char* filename, - ExtractorCallbacks* ec, - ScriptingEnvironment& se + ExtractorCallbacks * ec, + ScriptingEnvironment & se ); bool ReadHeader(); bool Parse();