WebKit Bugzilla
Attachment 358093 Details for
Bug 193030
: [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
bug-193030-20181227121651.patch (text/plain), 2.61 KB, created by
Fujii Hironori
on 2018-12-26 19:16:52 PST
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Fujii Hironori
Created:
2018-12-26 19:16:52 PST
Size:
2.61 KB
patch
obsolete
>Subversion Revision: 239554 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 9953c891b096f4757a281467b7e7b315ccba7707..c9c4ef62545037c9bc1ca8bd14f5a01dca30eefb 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,21 @@ >+2018-12-26 Fujii Hironori <Hironori.Fujii@sony.com> >+ >+ [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs >+ https://bugs.webkit.org/show_bug.cgi?id=193030 >+ >+ Reviewed by Ross Kirsling. >+ >+ Windows Debug builds are failing to compile due to >+ NO_RETURN_DUE_TO_ASSERT inconsistency of >+ NetworkHTTPSUpgradeChecker destructor's definition and >+ declaration. >+ >+ * NetworkProcess/NetworkHTTPSUpgradeChecker.h: Added >+ NO_RETURN_DUE_TO_ASSERT to NetworkHTTPSUpgradeChecker destructor >+ declaration. >+ * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp: Removed >+ NO_RETURN_DUE_TO_ASSERT from the definition. >+ > 2018-12-24 Fujii Hironori <Hironori.Fujii@sony.com> > > [WebKit][Win] Remove using namespace in the global scope >diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >index 89cfa8248f2c153a8a09e1872aa7318c62099ee4..d0f7d6abdb3f59e3844bd137fe50c6766d7c26b8 100644 >--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >@@ -79,7 +79,7 @@ NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker() > }); > } > >-NO_RETURN_DUE_TO_ASSERT NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker() >+NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker() > { > // This object should be owned by a singleton object. > ASSERT_NOT_REACHED(); >diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h >index 3837e677b7305e65e0d5dc5d29438d9a1594c49e..afae1dcdf6a7ee233ba483d28f7afa9ba1c6a443 100644 >--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h >+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h >@@ -45,7 +45,7 @@ namespace WebKit { > class NetworkHTTPSUpgradeChecker { > public: > NetworkHTTPSUpgradeChecker(); >- ~NetworkHTTPSUpgradeChecker(); >+ NO_RETURN_DUE_TO_ASSERT ~NetworkHTTPSUpgradeChecker(); > > // Returns `true` after internal setup is successfully completed. If there is an error with setup, or if setup is in-progress, it will return `false`. > bool didSetupCompleteSuccessfully() const { return m_didSetupCompleteSuccessfully; };
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193030
:
358054
|
358089
| 358093