diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-29 14:00:41 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-29 14:00:41 (GMT) |
| commit | 41afd00317922946ca2539d0be565bd8f917d239 (patch) | |
| tree | 7e598152767e6967dd17c43db741fe6e12993ccf /src/corelib/tools | |
| parent | 28c004a2750205750735ccb7a46549c376673434 (diff) | |
| download | Qt-41afd00317922946ca2539d0be565bd8f917d239.zip Qt-41afd00317922946ca2539d0be565bd8f917d239.tar.gz Qt-41afd00317922946ca2539d0be565bd8f917d239.tar.bz2 | |
Fix compilation in namespace
Reviewed-by: Joao
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qshareddata.h | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index a24cc71..b3a6db6 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -190,7 +190,7 @@ Q_INLINE_TEMPLATE void qSwap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, C QT_END_NAMESPACE namespace std { template <class T, class Cleanup> - Q_INLINE_TEMPLATE void swap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2) + Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QScopedPointer)<T, Cleanup> &p1, QT_PREPEND_NAMESPACE(QScopedPointer)<T, Cleanup> &p2) { p1.swap(p2); } } QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 1079595..45456fe 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -267,11 +267,11 @@ Q_INLINE_TEMPLATE void qSwap(QExplicitlySharedDataPointer<T> &p1, QExplicitlySha QT_END_NAMESPACE namespace std { template <class T> - Q_INLINE_TEMPLATE void swap(QSharedDataPointer<T> &p1, QSharedDataPointer<T> &p2) + Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QSharedDataPointer)<T> &p1, QT_PREPEND_NAMESPACE(QSharedDataPointer)<T> &p2) { p1.swap(p2); } template <class T> - Q_INLINE_TEMPLATE void swap(QExplicitlySharedDataPointer<T> &p1, QExplicitlySharedDataPointer<T> &p2) + Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)<T> &p1, QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)<T> &p2) { p1.swap(p2); } } QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 965ac14..ef8c454 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -788,7 +788,7 @@ inline void qSwap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) QT_END_NAMESPACE namespace std { template <class T> - inline void swap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) + inline void swap(QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p1, QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p2) { p1.swap(p2); } } QT_BEGIN_NAMESPACE |