WebKit Bugzilla
Attachment 356878 Details for
Bug 192491
: [WTF] Debug build fails due conflicting abort() method
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192491-20181208210900.patch (text/plain), 1.50 KB, created by
Adrian Perez
on 2018-12-08 11:09:02 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Adrian Perez
Created:
2018-12-08 11:09:02 PST
Size:
1.50 KB
patch
obsolete
>Subversion Revision: 239009 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index a21dc56e6bf5ba232f46686fa4a8ac2b9cebebf4..dbd9227bd1abf3015f482a3d07633610f47fc105 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,14 @@ >+2018-12-08 Adrian Perez de Castro <aperez@igalia.com> >+ >+ [WTF] Debug build fails due conflicting abort() method >+ https://bugs.webkit.org/show_bug.cgi?id=192491 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wtf/Assertions.h: Use namespaced std::abort() insted of plain abort() to avoid clashes >+ inside classes which have an ::abort() method, but only when __cplusplus is defined to >+ allow inclusion of the header in plain C sources. >+ > 2018-12-07 Andy Estes <aestes@apple.com> > > [Cocoa] Add optional variants of SOFT_LINK_CLASS_FOR_SOURCE >diff --git a/Source/WTF/wtf/Assertions.h b/Source/WTF/wtf/Assertions.h >index ebaaa056d563c7078b1d1be190fc9139e65ce4e0..f193996f002f41fd6aa38c5ba2e147cf50c8dce8 100644 >--- a/Source/WTF/wtf/Assertions.h >+++ b/Source/WTF/wtf/Assertions.h >@@ -241,8 +241,13 @@ WTF_EXPORT_PRIVATE bool WTFIsDebuggerAttached(void); > __builtin_unreachable(); \ > } while (0) > #elif !ENABLE(DEVELOPER_MODE) && !OS(DARWIN) >+#ifdef __cplusplus >+#define CRASH() std::abort() >+#define CRASH_UNDER_CONSTEXPR_CONTEXT() std::abort() >+#else > #define CRASH() abort() > #define CRASH_UNDER_CONSTEXPR_CONTEXT() abort() >+#endif // __cplusplus > #else > #define CRASH() WTFCrash() > #define CRASH_UNDER_CONSTEXPR_CONTEXT() WTFCrash()
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 192491
:
356789
| 356878