aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-03-09 18:31:58 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-03-09 18:31:58 +0900
commitc8d31ab28db19a7e1f1ca9cf1a35de17158c43fb (patch)
tree6bf5ecb0caaf633b33d56d0036b2165d90116a06
parent39399c95026d7c17701e492822dddcf321dd7b8b (diff)
downloadlibquotient-c8d31ab28db19a7e1f1ca9cf1a35de17158c43fb.tar.gz
libquotient-c8d31ab28db19a7e1f1ca9cf1a35de17158c43fb.zip
Fixed building with VS2013
-rw-r--r--util.h5
1 files changed, 3 insertions, 2 deletions
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());