Merge branch 'shared_memory' of https://github.com/DennisOSRM/Project-OSRM into shared_memory
This commit is contained in:
		
						commit
						74ccb53607
					
				| @ -157,7 +157,7 @@ public: | ||||
|     			", code " << e.get_error_code(); | ||||
|     		throw OSRMException(e.what()); | ||||
|     	} | ||||
| 	}; | ||||
| 	} | ||||
| 
 | ||||
| private: | ||||
| 	SharedMemoryFactory_tmpl() {} | ||||
|  | ||||
| @ -25,7 +25,7 @@ or see http://www.gnu.org/licenses/agpl.txt. | ||||
| #include "DataStructures/StaticRTree.h" | ||||
| #include "Server/DataStructures/BaseDataFacade.h" | ||||
| #include "Server/DataStructures/SharedDataType.h" | ||||
| #include "Util/BoostFilesystemFix.h" | ||||
| #include "Util/BoostFileSystemFix.h" | ||||
| #include "Util/IniFile.h" | ||||
| #include "Util/SimpleLogger.h" | ||||
| #include "Util/UUID.h" | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user