X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvalue.h;h=ba6118181260c1c92c2a53f8f885507914a4d759;hb=refs%2Fheads%2Fwip;hp=e2b9fb1c569782fcbc96dc9d687d9b48eb83388d;hpb=818ead7b6ccef1e4d2435cc959bc07f910fcde46;p=libs%2Fdatafile.git

diff --git a/source/value.h b/source/value.h
index e2b9fb1..ba61181 100644
--- a/source/value.h
+++ b/source/value.h
@@ -2,6 +2,8 @@
 #define MSP_DATAFILE_VALUE_H_
 
 #include <vector>
+#include <type_traits>
+#include <msp/core/attributes.h>
 #include <msp/core/meta.h>
 #include <msp/core/variant.h>
 #include "type.h"
@@ -17,12 +19,13 @@ private:
 
 public:
 	template<typename T>
-	Value(T d):
+	Value(T &&d, typename std::enable_if<!std::is_same<typename std::remove_reference<T>::type, Value>::value, int>::type = 0):
 		sig(TypeInfo<T>::signature),
-		data(static_cast<typename TypeInfo<T>::Store>(d))
+		data(static_cast<typename TypeInfo<T>::Store>(std::forward<T>(d)))
 	{ }
 
-	Value(Symbol d): sig(TypeInfo<Symbol>::signature), data(d) { }
+	Value(const Symbol &d): sig(TypeInfo<Symbol>::signature), data(d) { }
+	Value(Symbol &&d): sig(TypeInfo<Symbol>::signature), data(std::move(d)) { }
 
 	template<typename T>
 	typename TypeInfo<T>::Load get() const
@@ -34,8 +37,6 @@ private:
 	T get_() const;
 };
 
-typedef std::vector<Value> ValueArray __attribute__((deprecated));
-
 template<typename T>
 inline T Value::get_() const
 {