diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-06 18:15:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-18 18:35:50 +0200 |
| commit | c9bfd34fa00eb349f6fc37cbea58b71d96a05138 (patch) | |
| tree | 6f6fab4d7a41ed04e48d98783d3bb0bb47e7bac7 /src/corelib/arch/qatomic_x86.h | |
| parent | 2b00f97ab05f144293b26d1e0d8cf4c54d222f92 (diff) | |
Enable QAtomicInteger for char16_t and char32_t
Those are regular, integer types, of 16- and 32-bit width,
respectively. C++11's std::atomic supports them, so we should too.
C++11 also supports wchar_t, but since that type's size can change, I
don't feel like support for it in Qt is pressing.
Change-Id: I945b641c91a8a98be82715f878c382dee58ac98b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/arch/qatomic_x86.h')
| -rw-r--r-- | src/corelib/arch/qatomic_x86.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/arch/qatomic_x86.h b/src/corelib/arch/qatomic_x86.h index 094bf1ecb7..8fb83cd504 100644 --- a/src/corelib/arch/qatomic_x86.h +++ b/src/corelib/arch/qatomic_x86.h @@ -133,6 +133,12 @@ template<> struct QAtomicIntegerTraits<unsigned long> { enum { IsInteger = 1 }; template<> struct QAtomicIntegerTraits<long long> { enum { IsInteger = 1 }; }; template<> struct QAtomicIntegerTraits<unsigned long long> { enum { IsInteger = 1 }; }; +# ifdef Q_COMPILER_UNICODE_STRINGS +template<> struct QAtomicIntegerTraits<char16_t> { enum { IsInteger = 1 }; }; +template<> struct QAtomicIntegerTraits<char32_t> { enum { IsInteger = 1 }; }; +# endif + + /* * Guide for the inline assembly below: * |