From 41afd00317922946ca2539d0be565bd8f917d239 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 29 Oct 2010 16:00:41 +0200
Subject: Fix compilation in namespace

Reviewed-by: Joao
---
 src/corelib/global/qglobal.h            | 2 +-
 src/corelib/tools/qscopedpointer.h      | 2 +-
 src/corelib/tools/qshareddata.h         | 4 ++--
 src/corelib/tools/qsharedpointer_impl.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 4e78ab1..50f1538 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2092,7 +2092,7 @@ inline void qSwap(T &value1, T &value2)
 #define Q_DECLARE_SHARED_STL(TYPE) \
 QT_END_NAMESPACE \
 namespace std { \
-    template<> inline void swap<TYPE>(TYPE &value1, TYPE &value2) \
+    template<> inline void swap<QT_PREPEND_NAMESPACE(TYPE)>(QT_PREPEND_NAMESPACE(TYPE) &value1, QT_PREPEND_NAMESPACE(TYPE) &value2) \
     { swap(value1.data_ptr(), value2.data_ptr()); } \
 } \
 QT_BEGIN_NAMESPACE
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
-- 
cgit v0.12