diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-06 08:18:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-06 17:56:57 +0200 |
| commit | 480a459f6543be2723c58b3eed711232e41f58b7 (patch) | |
| tree | 833d8ff42a3eb45f0f19da3d47de2502834db473 | |
| parent | 2b355017a2ddc96f91ed6648fca646387d48a409 (diff) | |
QLocale: move some static_assert()s from _p.h into .cpp
There's no point in having each TU that includes this header unit-test
the ascii_isspace function anew.
Amends 7f9398fd4d23469c77c6a53eac0819f92dfc3928.
Pick-to: 6.4
Task-number: QTBUG-97601
Change-Id: I17addc3256f4afafb8ec6a86116654b0099efcda
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/text/qlocale_p.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 811df6dcdce..d88c53cf004 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -69,6 +69,20 @@ Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale) Q_CONSTINIT static QLocaleData systemLocaleData = {}; #endif +static_assert(ascii_isspace(' ')); +static_assert(ascii_isspace('\t')); +static_assert(ascii_isspace('\n')); +static_assert(ascii_isspace('\v')); +static_assert(ascii_isspace('\f')); +static_assert(ascii_isspace('\r')); +static_assert(!ascii_isspace('\0')); +static_assert(!ascii_isspace('\a')); +static_assert(!ascii_isspace('a')); +static_assert(!ascii_isspace('\177')); +static_assert(!ascii_isspace(uchar('\200'))); +static_assert(!ascii_isspace(uchar('\xA0'))); +static_assert(!ascii_isspace(uchar('\377'))); + /****************************************************************************** ** Helpers for accessing Qt locale database */ diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 4df44f4cd48..2ec779bff69 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -492,20 +492,6 @@ enum { AsciiSpaceMask = (1u << (' ' - 1)) | return c >= 1u && c <= 32u && (AsciiSpaceMask >> uint(c - 1)) & 1u; } -static_assert(ascii_isspace(' ')); -static_assert(ascii_isspace('\t')); -static_assert(ascii_isspace('\n')); -static_assert(ascii_isspace('\v')); -static_assert(ascii_isspace('\f')); -static_assert(ascii_isspace('\r')); -static_assert(!ascii_isspace('\0')); -static_assert(!ascii_isspace('\a')); -static_assert(!ascii_isspace('a')); -static_assert(!ascii_isspace('\177')); -static_assert(!ascii_isspace(uchar('\200'))); -static_assert(!ascii_isspace(uchar('\xA0'))); -static_assert(!ascii_isspace(uchar('\377'))); - QT_END_NAMESPACE // ### move to qstringview.h |