Changeset 37660 in webkit for trunk/JavaScriptCore/wtf/GOwnPtr.h

Timestamp:

Oct 17, 2008, 2:16:01 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-17 Marco Barisione <​[email protected]>

Reviewed by Sam Weinig. Landed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=21603
[GTK] Minor fixes to GOwnPtr

• wtf/GOwnPtr.cpp: (WTF::GError): (WTF::GList): (WTF::GCond): (WTF::GMutex): (WTF::GPatternSpec): (WTF::GDir):
• wtf/GOwnPtr.h: (WTF::freeOwnedGPtr): (WTF::GOwnPtr::~GOwnPtr): (WTF::GOwnPtr::outPtr): (WTF::GOwnPtr::set): (WTF::GOwnPtr::clear):
• wtf/Threading.h:

2008-10-17 Marco Barisione <​[email protected]>

Reviewed by Sam Weinig. Landed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=21603
[GTK] Minor fixes to GOwnPtr

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::mediaPlayerPrivateErrorCallback):

File:

• trunk/JavaScriptCore/wtf/GOwnPtr.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/GOwnPtr.h

@@ -29 +29 @@
 
 namespace WTF {
-    template <typename T> inline void freeOwnedPtr(T* ptr) { g_free(reinterpret_cast<void*>(ptr)); }
-    template<> void freeOwnedPtr<GError>(GError*);
-    template<> void freeOwnedPtr<GList>(GList*);
-    template<> void freeOwnedPtr<GCond>(GCond*);
-    template<> void freeOwnedPtr<GMutex>(GMutex*);
-    template<> void freeOwnedPtr<GPatternSpec>(GPatternSpec*);
-    template<> void freeOwnedPtr<GDir>(GDir*);
+    template <typename T> inline void freeOwnedGPtr(T* ptr) { g_free(reinterpret_cast<void*>(ptr)); }
+    template<> void freeOwnedGPtr<GError>(GError*);
+    template<> void freeOwnedGPtr<GList>(GList*);
+    template<> void freeOwnedGPtr<GCond>(GCond*);
+    template<> void freeOwnedGPtr<GMutex>(GMutex*);
+    template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
+    template<> void freeOwnedGPtr<GDir>(GDir*);
 
     template <typename T> class GOwnPtr : Noncopyable {
     public:
         explicit GOwnPtr(T* ptr = 0) : m_ptr(ptr) { }
-        ~GOwnPtr() { freeOwnedPtr(m_ptr); }
+        ~GOwnPtr() { freeOwnedGPtr(m_ptr); }
 
         T* get() const { return m_ptr; }
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
-        T*& rawPtr() { return m_ptr; }
+        T*& outPtr() { ASSERT(!m_ptr); return m_ptr; }
 
-        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); freeOwnedPtr(m_ptr); m_ptr = ptr; }
-        void clear() { freeOwnedPtr(m_ptr); m_ptr = 0; }
+        void set(T* ptr) { ASSERT(!ptr || m_ptr != ptr); freeOwnedGPtr(m_ptr); m_ptr = ptr; }
+        void clear() { freeOwnedGPtr(m_ptr); m_ptr = 0; }
 
         T& operator*() const { ASSERT(m_ptr); return *m_ptr; }