diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-11 07:59:53 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-11 08:14:11 (GMT) |
| commit | 1023209b9c335d72dc489d67e632d80cadac924d (patch) | |
| tree | 7da6eae795f07d631a33940e7481f38c40444e28 /src/corelib/tools/qsharedpointer_impl.h | |
| parent | 0c9866d6b23062bc08e739b66f41de200b660df4 (diff) | |
| download | Qt-1023209b9c335d72dc489d67e632d80cadac924d.zip Qt-1023209b9c335d72dc489d67e632d80cadac924d.tar.gz Qt-1023209b9c335d72dc489d67e632d80cadac924d.tar.bz2 | |
Fix build os QSharedPointer on MSVC
Which does not support template friends
Reviewed-by: Thiago
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |