From 1023209b9c335d72dc489d67e632d80cadac924d Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 11 Aug 2010 09:59:53 +0200
Subject: Fix build os QSharedPointer on MSVC

Which does not support template friends

Reviewed-by: Thiago
---
 src/corelib/tools/qsharedpointer_impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 7f0de5f..bb06f3a 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -322,7 +322,6 @@ namespace QtSharedPointer {
     protected:
         typedef ExternalRefCountData Data;
 
-        inline void ref() const { d->weakref.ref(); d->strongref.ref(); }
         inline void deref()
         { deref(d, this->value); }
         static inline void deref(Data *d, T *value)
@@ -409,6 +408,7 @@ namespace QtSharedPointer {
         template <class X> friend class QT_PREPEND_NAMESPACE(QWeakPointer);
         template <class X, class Y> friend QSharedPointer<X> copyAndSetPointer(X * ptr, const QSharedPointer<Y> &src);
 #endif
+        inline void ref() const { d->weakref.ref(); d->strongref.ref(); }
 
         inline void internalSet(Data *o, T *actual)
         {
-- 
cgit v0.12