From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 25 Jul 2011 14:10:01 +0000 (+0300)
Subject: Let Variant take care of detecting type mismatches
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=67146b1b3bcb7d02307dcd4cc8b88cf778b41205;p=libs%2Fdatafile.git

Let Variant take care of detecting type mismatches
---

diff --git a/source/value.h b/source/value.h
index 219b0e4..78ec54a 100644
--- a/source/value.h
+++ b/source/value.h
@@ -4,7 +4,6 @@
 #include <vector>
 #include <msp/core/meta.h>
 #include <msp/core/variant.h>
-#include "except.h"
 #include "type.h"
 
 namespace Msp {
@@ -40,9 +39,6 @@ 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