From 29bff90ecb0d1febfa8728383195f0f41c9a29ef Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 7 Oct 2016 18:55:07 +0900 Subject: Fix building with VS2013 --- jobs/syncjob.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jobs/syncjob.h b/jobs/syncjob.h index 55d7458c..a9138a65 100644 --- a/jobs/syncjob.h +++ b/jobs/syncjob.h @@ -38,7 +38,15 @@ namespace QMatrixClient { public: Owning() = default; +#if defined(_MSC_VER) && _MSC_VER < 1900 + // Workaround: Dangerous (auto_ptr style) copy constructor because + // VS2013 (unnecessarily) instantiates EventList::QVector<>::toList() + // which instantiates QList< Owning<> > which needs the contained + // object to have a non-deleted copy constructor. + Owning(Owning& other) : ContainerT(std::move(other)) { } +#else Owning(Owning&) = delete; +#endif Owning(Owning&& other) : ContainerT(std::move(other)) { } ~Owning() { for (auto e: *this) delete e; } -- cgit v1.2.3