X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fvariant.h;h=2dd9732fc60dd4faf1a692eef1be63d9c83328cd;hp=515350de6ae5543158e20b6e2c20d4ef786163fb;hb=90fc7638aee23270fe005f86dd1b492d67015c13;hpb=8db2c378e1d006afb792d829857e866541bf81a5

diff --git a/source/core/variant.h b/source/core/variant.h
index 515350d..2dd9732 100644
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -24,6 +24,8 @@ private:
 
 		virtual const std::type_info &type_id() const = 0;
 		virtual StoreBase *clone() const = 0;
+		virtual bool type_equals(const StoreBase &) const = 0;
+		virtual bool value_equals(const StoreBase &) const = 0;
 	};
 
 	template<typename T>
@@ -35,6 +37,16 @@ private:
 
 		virtual const std::type_info &type_id() const { return typeid(T); }
 		virtual StoreBase *clone() const { return new Store<T>(data); }
+		virtual bool type_equals(const StoreBase &s) const { return dynamic_cast<const Store<T> *>(&s); }
+		virtual bool value_equals(const StoreBase &s) const { return value_equals_<T>(s); }
+
+		template<typename U>
+		typename EnableIf<IsEqualityComparable<U>::value, bool>::Yes value_equals_(const StoreBase &s) const
+		{ const Store<T> *t = dynamic_cast<const Store<T> *>(&s); return (t && t->data==data); }
+
+		template<typename U>
+		typename EnableIf<IsEqualityComparable<U>::value, bool>::No value_equals_(const StoreBase &) const
+		{ return false; }
 	};
 
 	StoreBase *store;
@@ -91,6 +103,15 @@ public:
 		return dynamic_cast<Store<typename RemoveConst<T>::Type> *>(store)!=0;
 	}
 
+	bool check_same_type(const Variant &v) const
+	{ return store && v.store && store->type_equals(*v.store); }
+
+	bool operator==(const Variant &v) const
+	{ return store && v.store && store->value_equals(*v.store); }
+
+	bool operator!=(const Variant &v) const
+	{ return !(operator==(v)); }
+
 	template<typename T>
 	operator T() const
 	{ return value<T>(); }