fixing ticket 20. stxxl should not complain any more. also, there should be no compiler warnings.

This commit is contained in:
Dennis Luxen
2011-01-14 16:54:42 +00:00
parent 46a690dfc2
commit e32ba24b6a
11 changed files with 286 additions and 218 deletions
+2 -3
View File
@@ -34,7 +34,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../Util/StrIngUtil.h"
typedef ContractionCleanup::Edge::EdgeData EdgeData;
typedef StaticGraph<EdgeData>::InputEdge GridEdge;
typedef StaticGraph<EdgeData>::InputEdge InputEdge;
class RoutePlugin : public BasePlugin {
public:
@@ -46,10 +46,9 @@ public:
nodeHelpDesk->initNNGrid(nodesInStream);
//Deserialize road network graph
std::vector< GridEdge> * edgeList = new std::vector< GridEdge>();
std::vector< InputEdge> * edgeList = new std::vector< InputEdge>();
readHSGRFromStream(hsgrInStream, edgeList);
hsgrInStream.close();
graph = new StaticGraph<EdgeData>(nodeHelpDesk->getNumberOfNodes()-1, *edgeList);
delete edgeList;