diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2017-10-04 03:35:12 +0200 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-10-03 18:35:12 -0700 |
| commit | 10f5a84bfd5a38000e34f8ed75150110bb9440de (patch) | |
| tree | 622f2674b48a18effff4d2e512f335be96e093fc /src/pal/src/misc | |
| parent | 858f5e0658a63c39eaf14c34a2146a34950c387f (diff) | |
| download | coreclr-10f5a84bfd5a38000e34f8ed75150110bb9440de.tar.gz coreclr-10f5a84bfd5a38000e34f8ed75150110bb9440de.tar.bz2 coreclr-10f5a84bfd5a38000e34f8ed75150110bb9440de.zip | |
Fix broken ARM64 build (#14313)
The std::max was being passed arguments of different types (int and DWORD).
Diffstat (limited to 'src/pal/src/misc')
| -rw-r--r-- | src/pal/src/misc/sysinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pal/src/misc/sysinfo.cpp b/src/pal/src/misc/sysinfo.cpp index cb5dda62a8..bc55dadd4b 100644 --- a/src/pal/src/misc/sysinfo.cpp +++ b/src/pal/src/misc/sysinfo.cpp @@ -489,7 +489,7 @@ PAL_GetLogicalProcessorCacheSizeFromOS() // Assume L3$/CPU grows linearly from 256K to 1.5M/CPU as logicalCPUs grows from 2 to 12 CPUs DWORD logicalCPUs = PAL_GetLogicalCpuCountFromOS(); - cacheSize = logicalCPUs*std::min(1536, std::max(256, logicalCPUs*128))*1024; + cacheSize = logicalCPUs*std::min(1536, std::max(256, (int)logicalCPUs*128))*1024; } #endif |