diff options
| author | MITSUNARI Shigeo <[email protected]> | 2020-01-18 11:19:16 +0900 |
|---|---|---|
| committer | MITSUNARI Shigeo <[email protected]> | 2020-01-18 11:19:16 +0900 |
| commit | 6cc0f4dfc720ec19313ab0261bfbd2a3c483b10e (patch) | |
| tree | 2850dc1f9400e6ee944b2035cd5cf3a9a2b1d2cf | |
| parent | 5722393d41218fcf32a69127c725f0fb1e030ba5 (diff) | |
| download | xbyak-6cc0f4dfc720ec19313ab0261bfbd2a3c483b10e.tar.gz xbyak-6cc0f4dfc720ec19313ab0261bfbd2a3c483b10e.zip | |
Consider max defined as a macro on Windows
| -rw-r--r-- | xbyak/xbyak_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbyak/xbyak_util.h b/xbyak/xbyak_util.h index 4b3c9ba..91b2e21 100644 --- a/xbyak/xbyak_util.h +++ b/xbyak/xbyak_util.h @@ -149,8 +149,8 @@ class Cpu { /* Fallback values in case a hypervisor has 0xB leaf zeroed-out. */ - numCores_[SmtLevel - 1] = std::max(1u, numCores_[SmtLevel - 1]); - numCores_[CoreLevel - 1] = std::max(numCores_[SmtLevel - 1], numCores_[CoreLevel - 1]); + numCores_[SmtLevel - 1] = (std::max)(1u, numCores_[SmtLevel - 1]); + numCores_[CoreLevel - 1] = (std::max)(numCores_[SmtLevel - 1], numCores_[CoreLevel - 1]); } else { /* Failed to deremine num of cores without x2APIC support. |