X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvalue.h;h=bcddd6ed3aebb579256cd0a11061a76312a4a95c;hb=8a412367448c55916380ce7040ddbd0a75fa722e;hp=219b0e42dd5174cf8b5eabecf55df7f5b03b17d5;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/value.h b/source/value.h
index 219b0e4..bcddd6e 100644
--- a/source/value.h
+++ b/source/value.h
@@ -2,9 +2,9 @@
 #define MSP_DATAFILE_VALUE_H_
 
 #include <vector>
+#include <msp/core/attributes.h>
 #include <msp/core/meta.h>
 #include <msp/core/variant.h>
-#include "except.h"
 #include "type.h"
 
 namespace Msp {
@@ -18,15 +18,16 @@ private:
 
 public:
 	template<typename T>
-	Value(T d):
+	Value(T &&d):
 		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 RemoveReference<T>::Type get() const
+	typename TypeInfo<T>::Load get() const
 	{ return get_<typename TypeInfo<T>::Store>(); }
 
 	char get_signature() const { return sig; }
@@ -35,14 +36,9 @@ private:
 	T get_() const;
 };
 
-typedef std::vector<Value> ValueArray __attribute__((deprecated));
-
 template<typename T>
 inline T Value::get_() const
 {
-	if(sig!=TypeInfo<T>::signature)
-		throw TypeError("Type mismatch");
-
 	return data.value<typename TypeInfo<T>::Store>();
 }
 
@@ -51,10 +47,8 @@ inline FloatType::Store Value::get_<FloatType::Store>() const
 {
 	if(sig==IntType::signature)
 		return data.value<IntType::Store>();
-	else if(sig!=FloatType::signature)
-		throw TypeError("Type mismatch");
-
-	return data.value<FloatType::Store>();
+	else
+		return data.value<FloatType::Store>();
 }
 
 } // namespace DataFile