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

This commit is contained in:
Dennis Luxen 2013-11-27 16:37:48 +01:00
commit 24c6314f1a

View File

@ -160,7 +160,7 @@ int main( const int argc, const char * argv[] ) {
shared_layout_ptr->ram_index_file_name shared_layout_ptr->ram_index_file_name
); );
// add zero termination // add zero termination
unsigned end_of_string_index = std::min(1023ul, file_index_file_name.length()); unsigned end_of_string_index = std::min((std::size_t)1023, file_index_file_name.length());
shared_layout_ptr->ram_index_file_name[end_of_string_index] = '\0'; shared_layout_ptr->ram_index_file_name[end_of_string_index] = '\0';
// collect number of elements to store in shared memory object // collect number of elements to store in shared memory object