Title: [126511] trunk/Source/WTF
- Revision
- 126511
- Author
- [email protected]
- Date
- 2012-08-23 17:22:24 -0700 (Thu, 23 Aug 2012)
Log Message
Roll back in the part of r126475 that I had rolled out.
* wtf/FastMalloc.cpp:
(WTF): Disable the -Wunused-private-field warning around the declaration of
TCMalloc_Central_FreeListPadded since the padding is intentionally unused.
Only disable the warning if we detect it is enabled, since the warning may not
be supported by the version of Clang that is being used.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (126510 => 126511)
--- trunk/Source/WTF/ChangeLog 2012-08-24 00:17:53 UTC (rev 126510)
+++ trunk/Source/WTF/ChangeLog 2012-08-24 00:22:24 UTC (rev 126511)
@@ -28,6 +28,16 @@
2012-08-23 Mark Rowe <[email protected]>
+ Roll back in the part of r126475 that I had rolled out.
+
+ * wtf/FastMalloc.cpp:
+ (WTF): Disable the -Wunused-private-field warning around the declaration of
+ TCMalloc_Central_FreeListPadded since the padding is intentionally unused.
+ Only disable the warning if we detect it is enabled, since the warning may not
+ be supported by the version of Clang that is being used.
+
+2012-08-23 Mark Rowe <[email protected]>
+
Roll out part of r126475 that breaks the build with older versions of Clang.
* wtf/FastMalloc.cpp:
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (126510 => 126511)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-24 00:17:53 UTC (rev 126510)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2012-08-24 00:22:24 UTC (rev 126511)
@@ -2469,12 +2469,23 @@
int32_t cache_size_;
};
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#if defined(__has_warning) && __has_warning("-Wunused-private-field")
+#pragma clang diagnostic ignored "-Wunused-private-field"
+#endif
+#endif
+
// Pad each CentralCache object to multiple of 64 bytes
class TCMalloc_Central_FreeListPadded : public TCMalloc_Central_FreeList {
private:
char pad_[(64 - (sizeof(TCMalloc_Central_FreeList) % 64)) % 64];
};
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
//-------------------------------------------------------------------
// Global variables
//-------------------------------------------------------------------
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
