[webkit-reviews] review granted: [Bug 193030] [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs : [Attachment 358054] Patch

[bugzilla-daemon at webkit.org]

Ross Kirsling <ross.kirsling at sony.com> has granted Fujii Hironori
<Hironori.Fujii at sony.com>'s request for review:
Bug 193030: [MSVC] error C2381:
'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker':
redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs
https://bugs.webkit.org/show_bug.cgi?id=193030

Attachment 358054: Patch

https://bugs.webkit.org/attachment.cgi?id=358054&action=review




--- Comment #2 from Ross Kirsling <ross.kirsling at sony.com> ---
Comment on attachment 358054
  --> https://bugs.webkit.org/attachment.cgi?id=358054
Patch

I added that #if and comment here as a WinCairo Debug build fix here, because
it was very tricky to avoid breaking Cocoa Debug in the process:
https://bugs.webkit.org/show_bug.cgi?id=192482#c15

Looks like this issue is coming up again with the removal of
ENABLE_HTTPS_UPGRADE in r239474 (bug 192937):
https://trac.webkit.org/changeset/239474/webkit

Your fix is certainly much more satisfying than mine was, and I think if Mac
Debug EWS isn't complaining, we should be safe. Yay!