Minor C++ include fixes

This commit is contained in:
Dennis Luxen 2011-01-11 17:42:55 +00:00
parent edfa70aff0
commit f663df87d4
3 changed files with 5 additions and 4 deletions

View File

@ -24,8 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <climits> #include <climits>
#include <cmath> #include <cmath>
#include <string> #include <string>
#include <libxml/xmlreader.h> #include "HashTable.h"
#include "Util.h" #include "Util.h"
/* Default Speed Profile: /* Default Speed Profile:
@ -45,7 +44,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
ferry 5 ferry 5
*/ */
typedef google::dense_hash_map<string, NodeID> StringMap; typedef HashTable<std::string, NodeID> StringMap;
std::string names[14] = { "motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "unclassified", "residential", "living_street", "service", "ferry" }; std::string names[14] = { "motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "unclassified", "residential", "living_street", "service", "ferry" };
double speeds[14] = { 110, 90, 90, 70, 70, 60, 60, 50, 55, 25, 40 , 10, 30, 5}; double speeds[14] = { 110, 90, 90, 70, 70, 60, 60, 50, 55, 25, 40 , 10, 30, 5};

View File

@ -25,6 +25,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
#include <sys/time.h> #include <sys/time.h>
#include <tr1/functional_hash.h>
#include <boost/thread.hpp>
/** Returns a timestamp (now) in seconds (incl. a fractional part). */ /** Returns a timestamp (now) in seconds (incl. a fractional part). */
inline double get_timestamp() inline double get_timestamp()

View File

@ -30,7 +30,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <string> #include <string>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <libxml/xmlreader.h>
using namespace std; using namespace std;
#define VERBOSE(x) x #define VERBOSE(x) x