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

2013-11-27 16:37:48 +01:00 · 2013-11-27 16:37:48 +01:00 · 24c6314f1a
commit 24c6314f1a
parent 02e2b3bd47 ec84b3a0ca
1 changed files with 1 additions and 1 deletions
--- a/datastore.cpp
+++ b/datastore.cpp
@ -160,7 +160,7 @@ int main( const int argc, const char * argv[] ) {
            shared_layout_ptr->ram_index_file_name
        );
        // 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';

        // collect number of elements to store in shared memory object