From d997ec1e308e5bd2a3117d44e10176e1ee3a59a3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 12 Feb 2017 22:30:27 +0100 Subject: [PATCH] refs #879, added std::initializer_list in CVariantList --- src/blackmisc/variantlist.cpp | 10 ++++------ src/blackmisc/variantlist.h | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/variantlist.cpp b/src/blackmisc/variantlist.cpp index cddef82c8..b0522244e 100644 --- a/src/blackmisc/variantlist.cpp +++ b/src/blackmisc/variantlist.cpp @@ -11,11 +11,9 @@ namespace BlackMisc { - /* - * Construct from base class object - */ - CVariantList::CVariantList(const CSequence &other) : - CSequence(other) + CVariantList::CVariantList(const CSequence &other) : CSequence(other) {} -} // namespace + CVariantList::CVariantList(std::initializer_list il) : CSequence(il) + {} +} // ns diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index 6cc9501fe..a9a2bdeed 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -16,12 +16,10 @@ #include "blackmisc/collection.h" #include "blackmisc/sequence.h" #include "blackmisc/variant.h" - #include namespace BlackMisc { - //! Value object encapsulating a list of variants. class BLACKMISC_EXPORT CVariantList : public CSequence, @@ -31,11 +29,13 @@ namespace BlackMisc BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CVariantList) //! Default constructor. - CVariantList() = default; + CVariantList() {} //! Construct from a base class object. CVariantList(const CSequence &other); + //! Initializer list constructor. + CVariantList(std::initializer_list il); }; }