diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-05-15 07:48:49 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-07-16 21:13:45 -0700 |
| commit | 6bd35e47080b3ddfe14543f805e744846e245c2f (patch) | |
| tree | 83890a2624d04987ccb385e56c81080bc0a72cdc | |
| parent | 05bb156aaad8b539e9b28a6c7577e48319e281ba (diff) | |
Work around Apple Clang's -Wshadow warning
Well, yeah, it technically does...
qcborstream.h:245:15: warning: declaration shadows a typedef in the global namespace [-Wshadow]
/usr/include/libkern/OSTypes.h:36:26: note: previous declaration is here
Fixes: QTBUG-75825
Change-Id: Idce141629dd34287808bfffd159ee2a75428bf12
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/corelib/serialization/qcborstream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qcborstream.h b/src/corelib/serialization/qcborstream.h index 3b13a309ab..7a451e63ac 100644 --- a/src/corelib/serialization/qcborstream.h +++ b/src/corelib/serialization/qcborstream.h @@ -242,8 +242,8 @@ private: template <typename FP> FP _toFloatingPoint() const noexcept { - using UInt = typename QIntegerForSizeof<FP>::Unsigned; - UInt u = UInt(value64); + using UIntFP = typename QIntegerForSizeof<FP>::Unsigned; + UIntFP u = UIntFP(value64); FP f; memcpy(static_cast<void *>(&f), &u, sizeof(f)); return f; |