diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:56:29 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-11-26 09:09:25 +0100 |
| commit | 1217504a6020b11cc49761076679255cf4eac9fc (patch) | |
| tree | 56681fc0ee92a2651e531b46c2e41955eafc85f5 /src/corelib | |
| parent | 94e11a9f0c49e516d48524fb71f67064dc42eef7 (diff) | |
Add Q_DECL_RELAXED_CONSTEXPR to QPair
Change-Id: I9456e820bb514f020b9f1d6c7d68547f92a1f8ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qpair.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index b2217e4dd0..ae33d598d4 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -52,13 +52,13 @@ struct QPair template <typename TT1, typename TT2> Q_DECL_CONSTEXPR QPair(const QPair<TT1, TT2> &p) : first(p.first), second(p.second) {} template <typename TT1, typename TT2> - QPair &operator=(const QPair<TT1, TT2> &p) + Q_DECL_RELAXED_CONSTEXPR QPair &operator=(const QPair<TT1, TT2> &p) { first = p.first; second = p.second; return *this; } #ifdef Q_COMPILER_RVALUE_REFS template <typename TT1, typename TT2> Q_DECL_CONSTEXPR QPair(QPair<TT1, TT2> &&p) : first(std::move(p.first)), second(std::move(p.second)) {} template <typename TT1, typename TT2> - QPair &operator=(QPair<TT1, TT2> &&p) + Q_DECL_RELAXED_CONSTEXPR QPair &operator=(QPair<TT1, TT2> &&p) { first = std::move(p.first); second = std::move(p.second); return *this; } #endif |