From c8d31ab28db19a7e1f1ca9cf1a35de17158c43fb Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 9 Mar 2017 18:31:58 +0900 Subject: Fixed building with VS2013 --- util.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'util.h') diff --git a/util.h b/util.h index bc16c413..c1f8cebb 100644 --- a/util.h +++ b/util.h @@ -81,11 +81,12 @@ namespace QMatrixClient // in case of Owning< QVector<> > VS2013 (unnecessarily) instantiates // QVector<>::toList() which instantiates QList< Owning<> > which // requires the contained object to have a copy constructor. - Owning(Owning& other) : ContainerT(std::move(other)) { } + Owning(Owning& other) : ContainerT(other.release()) { } + Owning(Owning&& other) : ContainerT(other.release()) { } #else Owning(Owning&) = delete; -#endif Owning(Owning&& other) = default; +#endif Owning& operator=(Owning&& other) { assign(other.release()); -- cgit v1.2.3