From 6dbcd09121fe266c7704a524b5cbd7f2754659c0 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 20 Sep 2012 14:01:09 +0200
Subject: Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af
 (http://svn.webkit.org/repository/webkit/trunk@129119)

New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
---
 Source/JavaScriptCore/runtime/JSCell.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'Source/JavaScriptCore/runtime/JSCell.h')

diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h
index 94f08f31b..d6abcba99 100644
--- a/Source/JavaScriptCore/runtime/JSCell.h
+++ b/Source/JavaScriptCore/runtime/JSCell.h
@@ -33,6 +33,7 @@
 #include "SlotVisitorInlineMethods.h"
 #include "WriteBarrier.h"
 #include <wtf/Noncopyable.h>
+#include <wtf/TypeTraits.h>
 
 namespace JSC {
 
@@ -308,18 +309,10 @@ namespace JSC {
         return isCell() ? asCell()->toObject(exec, globalObject) : toObjectSlowCase(exec, globalObject);
     }
 
-#if COMPILER(CLANG)
     template<class T>
     struct NeedsDestructor {
-        static const bool value = !__has_trivial_destructor(T);
+        static const bool value = !WTF::HasTrivialDestructor<T>::value;
     };
-#else
-    // Write manual specializations for this struct template if you care about non-clang compilers.
-    template<class T>
-    struct NeedsDestructor {
-        static const bool value = true;
-    };
-#endif
 
     template<typename T>
     void* allocateCell(Heap& heap)
-- 
cgit v1.2.1