X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fvariant.h;h=af204f2233f3c7759665a0f6b729bd52459d4326;hp=1ad086e70381254422d92330e277b7fd43f4826d;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=99b9121e2158603372c7313400283b622e6754d8

diff --git a/source/core/variant.h b/source/core/variant.h
index 1ad086e..af204f2 100644
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -12,7 +12,7 @@ class type_mismatch: public std::runtime_error
 {
 public:
 	type_mismatch(const std::type_info &, const std::type_info &);
-	virtual ~type_mismatch() throw() = default;
+	~type_mismatch() throw() override = default;
 };
 
 
@@ -36,27 +36,27 @@ private:
 
 		Store(const T &d): data(d) { }
 
-		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); }
+		const std::type_info &type_id() const override { return typeid(T); }
+		StoreBase *clone() const override { return new Store<T>(data); }
+		bool type_equals(const StoreBase &s) const override { return dynamic_cast<const Store<T> *>(&s); }
+		bool value_equals(const StoreBase &s) const override { return _value_equals<T>(s); }
 
 		template<typename U>
-		typename std::enable_if<IsEqualityComparable<U>::value, bool>::type value_equals_(const StoreBase &s) const
+		typename std::enable_if<IsEqualityComparable<U>::value, bool>::type _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 std::enable_if<!IsEqualityComparable<U>::value, bool>::type value_equals_(const StoreBase &) const
+		typename std::enable_if<!IsEqualityComparable<U>::value, bool>::type _value_equals(const StoreBase &) const
 		{ return false; }
 	};
 
-	StoreBase *store = 0;
+	StoreBase *store = nullptr;
 
 public:
 	Variant() = default;
 	template<typename T>
 	Variant(const T &v): store(new Store<typename std::remove_cv<T>::type>(v)) { }
-	Variant(const Variant &v): store(v.store ? v.store->clone() : 0) { }
+	Variant(const Variant &v): store(v.store ? v.store->clone() : nullptr) { }
 	~Variant() { delete store; }
 
 	template<typename T>
@@ -69,8 +69,11 @@ public:
 
 	Variant &operator=(const Variant &v)
 	{
+		if(&v==this)
+			return *this;
+
 		delete store;
-		store = (v.store ? v.store->clone() : 0);
+		store = (v.store ? v.store->clone() : nullptr);
 		return *this;
 	}
 
@@ -101,7 +104,7 @@ public:
 	template<typename T>
 	bool check_type() const
 	{
-		return dynamic_cast<Store<typename std::remove_cv<T>::type> *>(store)!=0;
+		return dynamic_cast<Store<typename std::remove_cv<T>::type> *>(store);
 	}
 
 	bool check_same_type(const Variant &v) const