From bc016c53fc25ee219a67fe496497d92f538c9124 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 18 Sep 2013 18:59:46 +0200 Subject: QLinkedList: implement missing initializer_list ctor Found by tst_QLinkedList once compiled in C++11 mode. Change-Id: Idbf79d775c5271437dbb99c1c8cc7a2e8a7f08bf Reviewed-by: Thiago Macieira Reviewed-by: Olivier Goffart Reviewed-by: Giuseppe D'Angelo --- src/corelib/tools/qlinkedlist.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/corelib/tools/qlinkedlist.h') diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 56ff2da16d..79a62cb87c 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -50,6 +50,10 @@ #include +#if defined(Q_COMPILER_INITIALIZER_LISTS) +# include +#endif + QT_BEGIN_NAMESPACE @@ -80,6 +84,13 @@ class QLinkedList public: inline QLinkedList() : d(const_cast(&QLinkedListData::shared_null)) { } inline QLinkedList(const QLinkedList &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach(); } +#if defined(Q_COMPILER_INITIALIZER_LISTS) + inline QLinkedList(std::initializer_list list) + : d(const_cast(&QLinkedListData::shared_null)) + { + std::copy(list.begin(), list.end(), std::back_inserter(*this)); + } +#endif ~QLinkedList(); QLinkedList &operator=(const QLinkedList &); #ifdef Q_COMPILER_RVALUE_REFS -- cgit v1.2.3