Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' into ghoshkaj_mmaperize

Browse Source
This commit is contained in:
Daniel Patterson 2018-10-29 09:52:50 -07:00 committed by GitHub
commit 954121634f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,6 +3,8 @@
- Features: - Features:
- ADDED: direct mmapping of datafiles is now supported via the `-mmap` switch. [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242) - ADDED: direct mmapping of datafiles is now supported via the `-mmap` switch. [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
- REMOVED: the previous `--memory_file` switch is now deprecated and will fallback to `--mmap` [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242) - REMOVED: the previous `--memory_file` switch is now deprecated and will fallback to `--mmap` [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
- Windows:
- FIXED: Windows builds again. [#5249](https://github.com/Project-OSRM/osrm-backend/pull/5249)
# 5.19.0 # 5.19.0
- Changes from 5.18.0: - Changes from 5.18.0:

2
include/util/ieee754.hpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include <math.h> #include <math.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "msinttypes/stdint.h" #include "rapidjson/msinttypes/stdint.h"
#include <intrin.h> #include <intrin.h>
#else #else
#include <stdint.h> #include <stdint.h>