Merge branch 'master' of https://github.com/DennisOSRM/Project-OSRM
This commit is contained in:
		
						commit
						25ac07f8a6
					
				| @ -21,7 +21,7 @@ or see http://www.gnu.org/licenses/agpl.txt. | |||||||
| #ifndef CONCURRENTQUEUE_H_INCLUDED | #ifndef CONCURRENTQUEUE_H_INCLUDED | ||||||
| #define CONCURRENTQUEUE_H_INCLUDED | #define CONCURRENTQUEUE_H_INCLUDED | ||||||
| 
 | 
 | ||||||
| #include "typedefs.h" | #include "../typedefs.h" | ||||||
| 
 | 
 | ||||||
| /* 
 | /* 
 | ||||||
|    Concurrent Queue written by Anthony Williams:  |    Concurrent Queue written by Anthony Williams:  | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user