diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-11 11:35:19 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-19 19:38:23 +0200 |
| commit | 3e1d03b1eaf6a5e842bed4ae4f9bb8cca05e5b31 (patch) | |
| tree | 74dd3478dce3bc96121238300fc0bbc6ef97fc3e /util/unicode | |
| parent | 5b686e208ffc68f9f660d36c468280d50a40e3ad (diff) | |
Port Q_STATIC_ASSERT(_X) to static_assert
There is no reason for keep using our macro now that we have C++17.
The macro itself is left in for the moment being, as well as its
detection logic, because it's needed for C code (not everything
supports C11 yet). A few more cleanups will arrive in the next few
patches.
Note that this is a mere search/replace; some places were using
double braces to work around the presence of commas in a macro, no
attempt has been done to fix those.
tst_qglobal had just some minor changes to keep testing the macro.
Change-Id: I1c1c397d9f3e63db3338842bf350c9069ea57639
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'util/unicode')
| -rw-r--r-- | util/unicode/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 3d66af911c..32cc1d32e1 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -876,7 +876,7 @@ static const char *methods = static const int SizeOfPropertiesStruct = 20; static const QByteArray sizeOfPropertiesStructCheck = - "Q_STATIC_ASSERT(sizeof(Properties) == " + QByteArray::number(SizeOfPropertiesStruct) + ");\n\n"; + "static_assert(sizeof(Properties) == " + QByteArray::number(SizeOfPropertiesStruct) + ");\n\n"; struct PropertyFlags { bool operator==(const PropertyFlags &o) const { @@ -1526,10 +1526,10 @@ static void readDerivedNormalizationProps() if (propName == "Full_Composition_Exclusion") { d.excludedComposition = true; } else { - Q_STATIC_ASSERT(QString::NormalizationForm_D == 0); - Q_STATIC_ASSERT(QString::NormalizationForm_C == 1); - Q_STATIC_ASSERT(QString::NormalizationForm_KD == 2); - Q_STATIC_ASSERT(QString::NormalizationForm_KC == 3); + static_assert(QString::NormalizationForm_D == 0); + static_assert(QString::NormalizationForm_C == 1); + static_assert(QString::NormalizationForm_KD == 2); + static_assert(QString::NormalizationForm_KC == 3); QString::NormalizationForm form; if (propName == "NFD_QC") |