summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-27 16:39:07 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-09-14 09:47:51 +0200
commit533df067e9869522b348d172fee85b2a501540b6 (patch)
tree6e8472798e855a5206f357317f9267b8042cfffe /src/corelib/thread
parentc4378b8620453cd4bfaf12e45f623b3bdc1038e2 (diff)
Purge Q_{STDLIB,COMPILER}_UNICODE_STRINGS
These were now always defined, hence redundant. Leave the #define in place so that we can verify we actually do always define it, in a #else of an existing #if check on it. Change-Id: Iea4c3dbc8f9982268bcf81da5ef17fe2ebf5c462 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r--src/corelib/thread/qatomic.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 43f1a4e0d5..3c05661980 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -1705,9 +1705,7 @@ static_assert(sizeof(QAtomicInteger<long>));
static_assert(sizeof(QAtomicInteger<unsigned long>));
static_assert(sizeof(QAtomicInteger<quintptr>));
static_assert(sizeof(QAtomicInteger<qptrdiff>));
-#ifdef Q_COMPILER_UNICODE_STRINGS
static_assert(sizeof(QAtomicInteger<char32_t>));
-#endif
#ifdef Q_ATOMIC_INT16_IS_SUPPORTED
static_assert(sizeof(QAtomicInteger<short>));
@@ -1715,9 +1713,7 @@ static_assert(sizeof(QAtomicInteger<unsigned short>));
# if WCHAR_MAX < 0x10000
static_assert(sizeof(QAtomicInteger<wchar_t>));
# endif
-# ifdef Q_COMPILER_UNICODE_STRINGS
static_assert(sizeof(QAtomicInteger<char16_t>));
-# endif
#endif
#ifdef Q_ATOMIC_INT64_IS_SUPPORTED