From 8b668180ca7ae1f52cdbbbbee0788a5c5e8ab8b6 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 10 May 2012 11:11:57 +0200 Subject: 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 --- src/corelib/arch/qatomic_msvc.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/corelib/arch/qatomic_msvc.h') 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 -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 -- cgit v1.2.3