Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM into develop
This commit is contained in:
		
						commit
						7cf4d37595
					
				@ -123,6 +123,13 @@ public:
 | 
				
			|||||||
    bool _backward:1;
 | 
					    bool _backward:1;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					struct MinimalEdgeData {
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    EdgeWeight distance;
 | 
				
			||||||
 | 
					    bool forward;
 | 
				
			||||||
 | 
					    bool backward;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef NodeBasedEdge ImportEdge;
 | 
					typedef NodeBasedEdge ImportEdge;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // EDGE_H
 | 
					#endif // EDGE_H
 | 
				
			||||||
 | 
				
			|||||||
@ -1 +1 @@
 | 
				
			|||||||
disk=/tmp/stxxl,1,syscall
 | 
					disk=/tmp/stxxl,10,syscall
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user