Title: [109481] trunk/Source/_javascript_Core
- Revision
- 109481
- Author
- [email protected]
- Date
- 2012-03-01 18:32:38 -0800 (Thu, 01 Mar 2012)
Log Message
Revert my change. Broke builds.
Source/_javascript_Core/wtf/Atomics.h:188: error: redefinition of 'bool WTF::weakCompareAndSwap(volatile uintptr_t*, uintptr_t, uintptr_t)'
Source/_javascript_Core/wtf/Atomics.h:122: error: 'bool WTF::weakCompareAndSwap(volatile unsigned int*, unsigned int, unsigned i
* wtf/Atomics.h:
(WTF):
(WTF::weakCompareAndSwap):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (109480 => 109481)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-02 02:29:59 UTC (rev 109480)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-02 02:32:38 UTC (rev 109481)
@@ -1,5 +1,15 @@
2012-03-01 Ryosuke Niwa <[email protected]>
+ Revert my change. Broke builds.
+ Source/_javascript_Core/wtf/Atomics.h:188: error: redefinition of 'bool WTF::weakCompareAndSwap(volatile uintptr_t*, uintptr_t, uintptr_t)'
+ Source/_javascript_Core/wtf/Atomics.h:122: error: 'bool WTF::weakCompareAndSwap(volatile unsigned int*, unsigned int, unsigned i
+
+ * wtf/Atomics.h:
+ (WTF):
+ (WTF::weakCompareAndSwap):
+
+2012-03-01 Ryosuke Niwa <[email protected]>
+
Gcc build fix.
Rubber-stamped by Filip Pizlo.
Modified: trunk/Source/_javascript_Core/wtf/Atomics.h (109480 => 109481)
--- trunk/Source/_javascript_Core/wtf/Atomics.h 2012-03-02 02:29:59 UTC (rev 109480)
+++ trunk/Source/_javascript_Core/wtf/Atomics.h 2012-03-02 02:32:38 UTC (rev 109481)
@@ -118,11 +118,7 @@
#endif
-#if COMPILER(GCC) && !COMPILER(CLANG) // Work around a gcc bug
-inline bool weakCompareAndSwap(volatile unsigned* location, unsigned expected, unsigned newValue)
-#else
inline bool weakCompareAndSwap(unsigned* location, unsigned expected, unsigned newValue)
-#endif
{
#if ENABLE(COMPARE_AND_SWAP)
bool result;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
