X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvariant.h;h=f2d2ee563f339bb8b64eb020b516c3792b1db08f;hb=6a38983c19fe78753962288e206c5817ad595448;hp=8d6db9a3de116e81433ac0e6fb706a3748adba50;hpb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4;p=libs%2Fcore.git

diff --git a/source/core/variant.h b/source/core/variant.h
index 8d6db9a..f2d2ee5 100644
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -8,18 +8,29 @@ Distributed under the LGPL
 #ifndef MSP_CORE_VARIANT_H_
 #define MSP_CORE_VARIANT_H_
 
-#include "except.h"
+#include <stdexcept>
+#include <typeinfo>
 #include "meta.h"
 
 namespace Msp {
 
+class type_mismatch: public std::runtime_error
+{
+public:
+	type_mismatch(const std::type_info &, const std::type_info &);
+	~type_mismatch() throw() { }
+};
+
+
 class Variant
 {
 private:
 	struct StoreBase
 	{
 		virtual ~StoreBase() { }
-		virtual StoreBase *clone() const =0;
+
+		virtual const std::type_info &type_id() const = 0;
+		virtual StoreBase *clone() const = 0;
 	};
 
 	template<typename T>
@@ -28,6 +39,8 @@ private:
 		T data;
 
 		Store(T d): data(d) { }
+
+		virtual const std::type_info &type_id() const { return typeid(T); }
 		virtual StoreBase *clone() const { return new Store<T>(data); }
 	};
 
@@ -61,7 +74,7 @@ public:
 		typedef typename RemoveConst<T>::Type NCT;
 		Store<NCT> *s = dynamic_cast<Store<NCT> *>(store);
 		if(!s)
-			throw InvalidState("Type mismatch");
+			throw type_mismatch(typeid(T), (store ? store->type_id() : typeid(void)));
 		return s->data;
 	}