From a35ec3a6bf4d71c29d4c4e492ad33361d8d2dbbc Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 13 Aug 2009 10:32:10 +0300 Subject: Worked around RVCT scoping issues by making scope explicit in places that the compiler couldn't figure out when building qsharedpointer test. --- 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 76a5abb..1bbf465 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -411,7 +411,7 @@ public: // inline ~QSharedPointer() { } inline explicit QSharedPointer(T *ptr) : BaseClass(Qt::Uninitialized) - { internalConstruct(ptr); } + { BaseClass::internalConstruct(ptr); } template inline QSharedPointer(T *ptr, Deleter d) { BaseClass::internalConstruct(ptr, d); } @@ -441,7 +441,7 @@ public: template inline QSharedPointer &operator=(const QWeakPointer &other) - { internalSet(other.d, other.value); return *this; } + { BaseClass::internalSet(other.d, other.value); return *this; } template QSharedPointer staticCast() const -- cgit v0.12