Title: [239555] trunk/Source/WebKit
- Revision
- 239555
- Author
- [email protected]
- Date
- 2018-12-26 20:01:23 -0800 (Wed, 26 Dec 2018)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239554 => 239555)
--- trunk/Source/WebKit/ChangeLog 2018-12-26 20:42:47 UTC (rev 239554)
+++ trunk/Source/WebKit/ChangeLog 2018-12-27 04:01:23 UTC (rev 239555)
@@ -1,3 +1,21 @@
+2018-12-26 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
[WebKit][Win] Remove using namespace in the global scope
Modified: trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp (239554 => 239555)
--- trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2018-12-26 20:42:47 UTC (rev 239554)
+++ trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp 2018-12-27 04:01:23 UTC (rev 239555)
@@ -79,7 +79,7 @@
});
}
-NO_RETURN_DUE_TO_ASSERT NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker()
+NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker()
{
// This object should be owned by a singleton object.
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h (239554 => 239555)
--- trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h 2018-12-26 20:42:47 UTC (rev 239554)
+++ trunk/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h 2018-12-27 04:01:23 UTC (rev 239555)
@@ -45,7 +45,7 @@
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; };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
