diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qfreelist_p.h | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index a8d1132d06..2f98cf5cc1 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -207,7 +207,11 @@ public: template <typename T, typename ConstantsType> Q_DECL_CONSTEXPR inline QFreeList<T, ConstantsType>::QFreeList() - : _next(ConstantsType::InitialNextValue) + : +#if defined(Q_COMPILER_CONSTEXPR) + _v{}, // uniform initialization required +#endif + _next(ConstantsType::InitialNextValue) { } template <typename T, typename ConstantsType> diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index c5db3a7c9a..b96492d623 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -832,7 +832,12 @@ class StaticDayOfWeekAssociativeArray { static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) Q_DECL_NOTHROW { return int(day) - 1; } // alt: day % 7 public: Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() Q_DECL_NOEXCEPT_EXPR(noexcept(T())) - : contained(), data() {} +#ifdef Q_COMPILER_CONSTEXPR + : contained{}, data{} // arrays require uniform initialization +#else + : contained(), data() +#endif + {} Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return contained[day2idx(day)]; } Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return data[day2idx(day)]; } |