[webkit-reviews] review granted: [Bug 65088] Intel Compiler on windows fails to build : [Attachment 103108] Fix building with Intel Compiler on Windows with Qt

[bugzilla-daemon at webkit.org]

Benjamin Poulain <benjamin at webkit.org> has granted Aron Rosenberg
<arosenberg at logitech.com>'s request for review:
Bug 65088: Intel Compiler on windows fails to build
https://bugs.webkit.org/show_bug.cgi?id=65088

Attachment 103108: Fix building with Intel Compiler on Windows with Qt
https://bugs.webkit.org/attachment.cgi?id=103108&action=review

------- Additional Comments from Benjamin Poulain <benjamin at webkit.org>
View in context: https://bugs.webkit.org/attachment.cgi?id=103108&action=review


> ChangeLog:9
> +	   Disable warning that uses different number in Intel compiler than
Visual Studio
> +

Before landing, improve the changelog mentioning which warning is disabled.

> Source/JavaScriptCore/wtf/NullPtr.h:38
> -#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600)

> +#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600
&& !COMPILER(INTEL))

My bad, first time I did not notice the new test was inside the parenthesis.
This is ok.