diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-10-23 22:02:38 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-10-23 22:05:23 (GMT) |
| commit | bdef6d2613b424dffd49ce1bced8213670aec1e9 (patch) | |
| tree | 32a8e19846a83cef4abf6b40125331a19e4fef01 | |
| parent | 0e35dfc313523d42ad9a4fdaf6e33729562cd033 (diff) | |
| download | Qt-bdef6d2613b424dffd49ce1bced8213670aec1e9.zip Qt-bdef6d2613b424dffd49ce1bced8213670aec1e9.tar.gz Qt-bdef6d2613b424dffd49ce1bced8213670aec1e9.tar.bz2 | |
Fix warning introduced by last commit on hiding of the 'd' member
qsharedpointer_impl.h: In constructor 'QtSharedPointer::ExternalRefCount<T>::ExternalRefCount(T*, Deleter)':
qsharedpointer_impl.h:385: warning: declaration of 'd' shadows a member of 'this'
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 2519a22..2895bba 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -382,8 +382,8 @@ namespace QtSharedPointer { inline ExternalRefCount(T *ptr) : Basic<T>(Qt::Uninitialized) // throws { internalConstruct(ptr); } template <typename Deleter> - inline ExternalRefCount(T *ptr, Deleter d) : Basic<T>(Qt::Uninitialized) // throws - { internalConstruct(ptr, d); } + inline ExternalRefCount(T *ptr, Deleter deleter) : Basic<T>(Qt::Uninitialized) // throws + { internalConstruct(ptr, deleter); } inline ExternalRefCount(const ExternalRefCount<T> &other) : Basic<T>(other), d(other.d) { if (d) ref(); } |