diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-13 14:39:47 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-13 14:40:30 +0200 |
| commit | 042640042491106a2f5cbb6a93bbf8c0cade0b9d (patch) | |
| tree | 259e412414fc86508b4c066a928d7b01c3d3a0b6 /src/3rdparty/masm | |
| parent | 6df6c10e1af827d06a387e7422176dd310cf83be (diff) | |
| parent | f720242419cd73529277173e43e9f7a8ed367ad3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.8
Change-Id: I175b27337b534c0b8f46a4a792d2c43cde73ffc4
Diffstat (limited to 'src/3rdparty/masm')
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 9c38af6b16..75e3670367 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -152,7 +152,7 @@ inline long lroundf(float num) { return static_cast<long>(roundf(num)); } inline long long abs(long num) { return labs(num); } #endif -#if COMPILER(MSVC) +#if COMPILER(MSVC) && COMPILER(MSVC12_OR_LOWER) // MSVC's math.h does not currently supply log2 or log2f. inline double log2(double num) { |