From 86ee853f47ebe9d9705434ab4311caf20c1db7d6 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 6 Feb 2012 11:42:27 +0100 Subject: [PATCH] Silence syncqt warnings for atomic implementation headers Most of these headers are either forwarding headers, or we explicitly stop syncqt so that it doesn't generate class includes for the atomic implementation. Either way, syncqt doesn't see the QT_END_* (and sometimes not QT_BEGIN_*), which this commit fixes. Change-Id: Icc8da6f384f38b1ff4eb265c731ce2f2ed92a1a3 Reviewed-by: Thiago Macieira --- src/corelib/arch/qatomic_arm.h | 9 +++++++++ src/corelib/arch/qatomic_armv5.h | 4 ++++ src/corelib/arch/qatomic_armv6.h | 4 ++++ src/corelib/arch/qatomic_armv7.h | 9 +++++++++ src/corelib/arch/qatomic_bootstrap.h | 4 ++++ src/corelib/arch/qatomic_cxx11.h | 4 ++++ src/corelib/arch/qatomic_gcc.h | 4 ++++ src/corelib/arch/qatomic_i386.h | 4 ++++ src/corelib/arch/qatomic_ia64.h | 4 ++++ src/corelib/arch/qatomic_mips.h | 4 ++++ src/corelib/arch/qatomic_msvc.h | 4 ++++ src/corelib/arch/qatomic_x86_64.h | 4 ++++ src/corelib/thread/qbasicatomic.h | 4 ++++ src/corelib/thread/qgenericatomic.h | 4 ++++ src/corelib/thread/qoldbasicatomic.h | 4 ++++ 15 files changed, 70 insertions(+) diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h index 3852bbb9e2..4394765d45 100644 --- a/src/corelib/arch/qatomic_arm.h +++ b/src/corelib/arch/qatomic_arm.h @@ -63,4 +63,13 @@ # include "QtCore/qatomic_armv5.h" #endif +#if 0 +// silence syncqt warnings +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE +QT_END_HEADER +#endif + #endif // QATOMIC_ARM_H diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index 95ad73b713..b3136fe575 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 7095d13d9b..41f145ad0d 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h index 5b36708ad6..43ea8ca973 100644 --- a/src/corelib/arch/qatomic_armv7.h +++ b/src/corelib/arch/qatomic_armv7.h @@ -52,4 +52,13 @@ // ... but the implementation is otherwise identical to that for ARMv6 #include "QtCore/qatomic_armv6.h" +#if 0 +// silence syncqt warnings +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE +QT_END_HEADER +#endif + #endif // QATOMIC_ARMV7_H diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h index 10cdc888f6..75f328b7c7 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/arch/qatomic_bootstrap.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h index c2df59fd54..27e0acda64 100644 --- a/src/corelib/arch/qatomic_cxx11.h +++ b/src/corelib/arch/qatomic_cxx11.h @@ -49,6 +49,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_gcc.h b/src/corelib/arch/qatomic_gcc.h index b5244429e6..225a7809eb 100644 --- a/src/corelib/arch/qatomic_gcc.h +++ b/src/corelib/arch/qatomic_gcc.h @@ -48,6 +48,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_i386.h b/src/corelib/arch/qatomic_i386.h index 6fec561177..4d9d810318 100644 --- a/src/corelib/arch/qatomic_i386.h +++ b/src/corelib/arch/qatomic_i386.h @@ -49,6 +49,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index b5cd9f7545..d82ad12223 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 04015c9d19..af6e93d06e 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index eeb37dba89..c5d7848734 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -48,6 +48,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h index f2fa8ce5f4..33427ebf33 100644 --- a/src/corelib/arch/qatomic_x86_64.h +++ b/src/corelib/arch/qatomic_x86_64.h @@ -50,6 +50,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 47d690c13f..527031bbd1 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -78,6 +78,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(Core) #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index 984ebed47b..f4d5e2f8d9 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -48,6 +48,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index a1985793ed..4697da6301 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -50,6 +50,10 @@ QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif