diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index c219d310dce..80543f1983b 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -386,7 +386,7 @@ public: inline QSharedPointer &operator=(const QWeakPointer &other) { internalSet(other.d, other.value); return *this; } - inline void swap(QSharedPointer &other) + inline void swap(QSharedPointer &other) noexcept { this->internalSwap(other); } inline void reset() { clear(); } @@ -880,18 +880,12 @@ Q_INLINE_TEMPLATE QWeakPointer QSharedPointer::toWeakRef() const } template -inline void qSwap(QSharedPointer &p1, QSharedPointer &p2) -{ - p1.swap(p2); -} +inline void swap(QSharedPointer &p1, QSharedPointer &p2) noexcept +{ p1.swap(p2); } -QT_END_NAMESPACE -namespace std { - template - inline void swap(QT_PREPEND_NAMESPACE(QSharedPointer) &p1, QT_PREPEND_NAMESPACE(QSharedPointer) &p2) - { p1.swap(p2); } -} -QT_BEGIN_NAMESPACE +template +inline void swap(QWeakPointer &p1, QWeakPointer &p2) noexcept +{ p1.swap(p2); } namespace QtSharedPointer { // helper functions: