X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvalue.h;h=e2b9fb1c569782fcbc96dc9d687d9b48eb83388d;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=1b12db9a22db5f40e77578199bdfd7817fff4093;hpb=a582163d380833b1370ba067a1fd0ad5c2984723;p=libs%2Fdatafile.git diff --git a/source/value.h b/source/value.h index 1b12db9..e2b9fb1 100644 --- a/source/value.h +++ b/source/value.h @@ -1,17 +1,9 @@ -/* $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 #include #include -#include "except.h" #include "type.h" namespace Msp { @@ -33,7 +25,7 @@ public: Value(Symbol d): sig(TypeInfo::signature), data(d) { } template - typename RemoveReference::Type get() const + typename TypeInfo::Load get() const { return get_::Store>(); } char get_signature() const { return sig; } @@ -47,9 +39,6 @@ typedef std::vector ValueArray __attribute__((deprecated)); template inline T Value::get_() const { - if(sig!=TypeInfo::signature) - throw TypeError("Type mismatch"); - return data.value::Store>(); } @@ -58,10 +47,8 @@ inline FloatType::Store Value::get_() const { if(sig==IntType::signature) return data.value(); - else if(sig!=FloatType::signature) - throw TypeError("Type mismatch"); - - return data.value(); + else + return data.value(); } } // namespace DataFile