wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1044658 - 1/6 - remove useless template parameters around WeakPtr - r=froydnj

Browse Source
This commit is contained in:
Benoit Jacob 2014-07-30 15:52:01 -04:00
parent c0d331675b
commit 587bd8000c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mfbt/WeakPtr.h
View File

@ -77,8 +77,8 @@
namespace mozilla { namespace mozilla {
template <typename T, class WeakReference> class WeakPtrBase; template <typename T> class WeakPtrBase;
template <typename T, class WeakReference> class SupportsWeakPtrBase; template <typename T> class SupportsWeakPtrBase;
namespace detail { namespace detail {
@ -118,8 +118,8 @@ public:
#endif #endif
private: private:
friend class WeakPtrBase<T, WeakReference<T> >; friend class WeakPtrBase<T>;
friend class SupportsWeakPtrBase<T, WeakReference<T> >; friend class SupportsWeakPtrBase<T>;
void detach() { mPtr = nullptr; } void detach() { mPtr = nullptr; }
@ -128,49 +128,49 @@ private:
} // namespace detail } // namespace detail
template <typename T, class WeakReference> template <typename T>
class SupportsWeakPtrBase class SupportsWeakPtrBase
{ {
public: public:
WeakPtrBase<T, WeakReference> asWeakPtr() WeakPtrBase<T> asWeakPtr()
{ {
if (!weakRef) { if (!weakRef) {
weakRef = new WeakReference(static_cast<T*>(this)); weakRef = new detail::WeakReference<T>(static_cast<T*>(this));
} }
return WeakPtrBase<T, WeakReference>(weakRef); return WeakPtrBase<T>(weakRef);
} }
protected: protected:
~SupportsWeakPtrBase() ~SupportsWeakPtrBase()
{ {
static_assert(IsBaseOf<SupportsWeakPtrBase<T, WeakReference>, T>::value, static_assert(IsBaseOf<SupportsWeakPtrBase<T>, T>::value,
"T must derive from SupportsWeakPtrBase<T, WeakReference>"); "T must derive from SupportsWeakPtrBase<T>");
if (weakRef) { if (weakRef) {
weakRef->detach(); weakRef->detach();
} }
} }
private: private:
friend class WeakPtrBase<T, WeakReference>; friend class WeakPtrBase<T>;
RefPtr<WeakReference> weakRef; RefPtr<detail::WeakReference<T>> weakRef;
}; };
template <typename T> template <typename T>
class SupportsWeakPtr : public SupportsWeakPtrBase<T, detail::WeakReference<T> > class SupportsWeakPtr : public SupportsWeakPtrBase<T>
{ {
}; };
template <typename T, class WeakReference> template <typename T>
class WeakPtrBase class WeakPtrBase
{ {
public: public:
WeakPtrBase(const WeakPtrBase<T, WeakReference>& aOther) WeakPtrBase(const WeakPtrBase<T>& aOther)
: mRef(aOther.mRef) : mRef(aOther.mRef)
{} {}
// Ensure that mRef is dereferenceable in the uninitialized state. // Ensure that mRef is dereferenceable in the uninitialized state.
WeakPtrBase() : mRef(new WeakReference(nullptr)) {} WeakPtrBase() : mRef(new detail::WeakReference<T>(nullptr)) {}
operator T*() const { return mRef->get(); } operator T*() const { return mRef->get(); }
T& operator*() const { return *mRef->get(); } T& operator*() const { return *mRef->get(); }
@ -180,17 +180,17 @@ public:
T* get() const { return mRef->get(); } T* get() const { return mRef->get(); }
private: private:
friend class SupportsWeakPtrBase<T, WeakReference>; friend class SupportsWeakPtrBase<T>;
explicit WeakPtrBase(const RefPtr<WeakReference>& aOther) : mRef(aOther) {} explicit WeakPtrBase(const RefPtr<detail::WeakReference<T>>& aOther) : mRef(aOther) {}
RefPtr<WeakReference> mRef; RefPtr<detail::WeakReference<T>> mRef;
}; };
template <typename T> template <typename T>
class WeakPtr : public WeakPtrBase<T, detail::WeakReference<T> > class WeakPtr : public WeakPtrBase<T>
{ {
typedef WeakPtrBase<T, detail::WeakReference<T> > Base; typedef WeakPtrBase<T> Base;
public: public:
WeakPtr(const WeakPtr<T>& aOther) : Base(aOther) {} WeakPtr(const WeakPtr<T>& aOther) : Base(aOther) {}
MOZ_IMPLICIT WeakPtr(const Base& aOther) : Base(aOther) {} MOZ_IMPLICIT WeakPtr(const Base& aOther) : Base(aOther) {}