Changeset 95823 in webkit

Timestamp:

Sep 23, 2011, 9:49:08 AM (14 years ago)

Author:

andersca@apple.com

Message:

We should add support for OVERRIDE and FINAL annotations
​https://bugs.webkit.org/show_bug.cgi?id=68654

Reviewed by David Hyatt.

Add OVERRIDE and FINAL macros for compilers that support them.

• wtf/Compiler.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Compiler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-22  Anders Carlsson  <andersca@apple.com>
+
+        We should add support for OVERRIDE and FINAL annotations
+        https://bugs.webkit.org/show_bug.cgi?id=68654
+
+        Reviewed by David Hyatt.
+
+        Add OVERRIDE and FINAL macros for compilers that support them.
+
+        * wtf/Compiler.h:
+
 2011-09-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Compiler.h

@@ -35 +35 @@
 #if defined(__clang__)
 #define WTF_COMPILER_CLANG 1
+
+#ifndef __has_extension
+#define __has_extension __has_feature /* Compatibility with older versions of clang */
+#endif
+
 #endif
 
@@ -190 +195 @@
 #endif
 
+/* OVERRIDE */
+
+#ifndef OVERRIDE
+#if COMPILER(CLANG)
+#if __has_extension(cxx_override_control)
+#define OVERRIDE override
+#endif
+#elif COMPILER(MSVC)
+#define OVERRIDE override
+#else
+#define OVERRIDE
+#endif
+#endif
+
+/* FINAL */
+
+#ifndef FINAL
+#if COMPILER(CLANG)
+#if __has_extension(cxx_override_control)
+#define FINAL final
+#endif
+#elif COMPILER(MSVC)
+#define FINAL sealed
+#else
+#define FINAL
+#endif
+#endif
 
 #endif /* WTF_Compiler_h */