From dd8b75d8fb2503aed9e29fabf3cfd3a33a0efb5a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 17 Dec 2014 18:10:19 -0800 Subject: Remove workarounds for RVCT compiler bugs This does not try to remove support for RVCT. There has been no report of it working or failing to work, so the status continues to be unknown. In particular, the inline assembly code in atomic_armv[56].h remains in place. This commit only removes workarounds for compiler bugs or bogus warnings, assuming that anyone using this compiler has updated since Qt last tried to use it for Symbian in 2011. Note also how anonymous unions are now part of the language in C++11. Change-Id: Idc4fab092beb31239eb08b7e139bce2602adae81 Reviewed-by: Lars Knoll --- src/corelib/kernel/qfunctions_p.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/corelib/kernel/qfunctions_p.h') diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h index b10d92398b..d0623aab6b 100644 --- a/src/corelib/kernel/qfunctions_p.h +++ b/src/corelib/kernel/qfunctions_p.h @@ -57,14 +57,8 @@ # include "QtCore/qfunctions_winrt.h" #endif -#ifdef Q_CC_RVCT -// rvct doesn't see static operators when using our qalgorithms -# define Q_STATIC_GLOBAL_OPERATOR inline -# define Q_STATIC_GLOBAL_INLINE_OPERATOR inline -#else -# define Q_STATIC_GLOBAL_OPERATOR static -# define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline -#endif +#define Q_STATIC_GLOBAL_OPERATOR static +#define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline #endif -- cgit v1.2.3