Title: [239012] trunk/Source/WTF
- Revision
- 239012
- Author
- [email protected]
- Date
- 2018-12-08 14:10:37 -0800 (Sat, 08 Dec 2018)
Log Message
[WTF] Debug build fails due conflicting abort() method
https://bugs.webkit.org/show_bug.cgi?id=192491
Reviewed by Michael Catanzaro.
* 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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (239011 => 239012)
--- trunk/Source/WTF/ChangeLog 2018-12-08 21:53:28 UTC (rev 239011)
+++ trunk/Source/WTF/ChangeLog 2018-12-08 22:10:37 UTC (rev 239012)
@@ -1,3 +1,14 @@
+2018-12-08 Adrian Perez de Castro <[email protected]>
+
+ [WTF] Debug build fails due conflicting abort() method
+ https://bugs.webkit.org/show_bug.cgi?id=192491
+
+ Reviewed by Michael Catanzaro.
+
+ * 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 <[email protected]>
[Cocoa] Add optional variants of SOFT_LINK_CLASS_FOR_SOURCE
Modified: trunk/Source/WTF/wtf/Assertions.h (239011 => 239012)
--- trunk/Source/WTF/wtf/Assertions.h 2018-12-08 21:53:28 UTC (rev 239011)
+++ trunk/Source/WTF/wtf/Assertions.h 2018-12-08 22:10:37 UTC (rev 239012)
@@ -241,8 +241,13 @@
__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()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
