From ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Feb 2012 16:36:50 +0100 Subject: Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790) --- Source/JavaScriptCore/wtf/ThreadSpecific.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/wtf/ThreadSpecific.h') diff --git a/Source/JavaScriptCore/wtf/ThreadSpecific.h b/Source/JavaScriptCore/wtf/ThreadSpecific.h index 242acc0d3..f20a3f3df 100644 --- a/Source/JavaScriptCore/wtf/ThreadSpecific.h +++ b/Source/JavaScriptCore/wtf/ThreadSpecific.h @@ -77,12 +77,11 @@ private: // have exited). It's unlikely that any user of this call will be in that situation - and having // a destructor defined can be confusing, given that it has such strong pre-requisites to work correctly. ~ThreadSpecific(); - + T* get(); void set(T*); void static destroy(void* ptr); -#if USE(PTHREADS) || PLATFORM(QT) || PLATFORM(GTK) || OS(WINDOWS) struct Data { WTF_MAKE_NONCOPYABLE(Data); public: @@ -94,7 +93,6 @@ private: void (*destructor)(void*); #endif }; -#endif #if USE(PTHREADS) pthread_key_t m_key; @@ -239,6 +237,6 @@ inline T& ThreadSpecific::operator*() return *operator T*(); } -} +} // namespace WTF -#endif +#endif // WTF_ThreadSpecific_h -- cgit v1.2.1