diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-13 07:32:10 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-13 07:32:10 (GMT) |
| commit | a35ec3a6bf4d71c29d4c4e492ad33361d8d2dbbc (patch) | |
| tree | 6c7cd8509a33bf2d4c997e9c1eacb8bd0f4d169f /src | |
| parent | f888b7c0934069771812c458faaad12bb72d3971 (diff) | |
| download | Qt-a35ec3a6bf4d71c29d4c4e492ad33361d8d2dbbc.zip Qt-a35ec3a6bf4d71c29d4c4e492ad33361d8d2dbbc.tar.gz Qt-a35ec3a6bf4d71c29d4c4e492ad33361d8d2dbbc.tar.bz2 | |
Worked around RVCT scoping issues by making scope explicit in places that
the compiler couldn't figure out when building qsharedpointer test.
Diffstat (limited to 'src')
| -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 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 <typename Deleter> inline QSharedPointer(T *ptr, Deleter d) { BaseClass::internalConstruct(ptr, d); } @@ -441,7 +441,7 @@ public: template <class X> inline QSharedPointer<T> &operator=(const QWeakPointer<X> &other) - { internalSet(other.d, other.value); return *this; } + { BaseClass::internalSet(other.d, other.value); return *this; } template <class X> QSharedPointer<X> staticCast() const |