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

diff --git a/source/value.h b/source/value.h
index 1b12db9..ba61181 100644
--- a/source/value.h
+++ b/source/value.h
@@ -1,17 +1,11 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_VALUE_H_
 #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 "except.h"
 #include "type.h"
 
 namespace Msp {
@@ -25,15 +19,16 @@ 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 RemoveReference<T>::Type get() const
+	typename TypeInfo<T>::Load get() const
 	{ return get_<typename TypeInfo<T>::Store>(); }
 
 	char get_signature() const { return sig; }
@@ -42,14 +37,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>();
 }
 
@@ -58,10 +48,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