diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-05-10 11:11:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 13:50:35 +0200 |
| commit | 8b668180ca7ae1f52cdbbbbee0788a5c5e8ab8b6 (patch) | |
| tree | fd302c087d8730f175c62e9eb45b0be4039a7413 /src/corelib/arch | |
| parent | 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d (diff) | |
Compile with -qtnamespace on Windows
qatomic_msvc.h declares some Windows intrinsic functions which should
not be in the Qt namespace.
Change-Id: I1b2f91798159c08cf167ee3d1ed2818c12c9b833
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib/arch')
| -rw-r--r-- | src/corelib/arch/qatomic_msvc.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index c5d7848734..4f7f971ec8 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -44,17 +44,6 @@ #include <QtCore/qgenericatomic.h> -QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - -#if 0 -// silence syncqt warnings -QT_END_NAMESPACE -QT_END_HEADER - -#pragma qt_sync_stop_processing -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// #ifndef Q_OS_WINCE @@ -225,6 +214,17 @@ extern "C" { //////////////////////////////////////////////////////////////////////////////////////////////////// +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_WAIT_FREE |