From bdef6d2613b424dffd49ce1bced8213670aec1e9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Sun, 24 Oct 2010 00:02:38 +0200
Subject: 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'
---
 src/corelib/tools/qsharedpointer_impl.h | 4 ++--
 1 file 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(); }
-- 
cgit v0.12