diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-14 16:37:11 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-16 11:55:34 +0200 |
| commit | e37c0c20bcccd77f631c1fd229b07cc5eae9a269 (patch) | |
| tree | 524584207e6fa8838e48dd63bd693663f1abc8e0 /src/corelib/tools/qhash.cpp | |
| parent | 0f94430a0fba5509d2d756832cb44a266d1d2e86 (diff) | |
QHash: simplify HashSeedStorage::initialize()
By not splitting Q_UNREACHABLE() and the following return, we can get
rid of the NOLINT(qt-use-unreachable-return).
Change-Id: I3322843e38dabdadb38eea38a6d91b301257fd23
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qhash.cpp')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index bac2a01afc..5aa0acd9ea 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -107,8 +107,7 @@ private: StateResult result = { 0, OverriddenByEnvironment }; #ifdef QT_BOOTSTRAPPED Q_UNUSED(which); - // NOLINTNEXTLINE(qt-use-unreachable-return): triggers on QT_BOOTSTRAPPED, breaking #else case - Q_UNREACHABLE(); + Q_UNREACHABLE_RETURN(result); #else // can't use qEnvironmentVariableIntValue (reentrancy) const char *seedstr = getenv("QT_HASH_SEED"); @@ -138,8 +137,8 @@ private: result.requestedSeed = x.data[i]; } result.state = JustInitialized; -#endif return result; +#endif } inline HashSeedStorage::StateResult HashSeedStorage::state(int which) |