Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM into develop

2013-01-02 00:41:08 +01:00 · 2013-01-02 00:41:08 +01:00 · 7cf4d37595
commit 7cf4d37595
parent 80add9f820 c5e8bed1fb
2 changed files with 8 additions and 1 deletions
--- a/DataStructures/ImportEdge.h
+++ b/DataStructures/ImportEdge.h
@ -123,6 +123,13 @@ public:
    bool _backward:1;
 };

+struct MinimalEdgeData {
+public:
+    EdgeWeight distance;
+    bool forward;
+    bool backward;
+};
+
 typedef NodeBasedEdge ImportEdge;

 #endif // EDGE_H
--- a/test/.stxxl
+++ b/test/.stxxl
@ -1 +1 @@
-disk=/tmp/stxxl,1,syscall
+disk=/tmp/stxxl,10,syscall