From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 30 Sep 2012 14:23:24 +0000 (+0200)
Subject: added mixed-type operators to Vector template
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;ds=sidebyside;h=a8fdd58e31c27a2de9649a1bf29389f4f3e4cb7c;p=l2e.git

added mixed-type operators to Vector template
---

diff --git a/src/geometry/Vector.h b/src/geometry/Vector.h
index bf64713..562648b 100644
--- a/src/geometry/Vector.h
+++ b/src/geometry/Vector.h
@@ -37,21 +37,37 @@ template<class T>
 inline Vector<T> operator +(const Vector<T> &lhs, const Vector<T> &rhs) {
 	return Vector<T>(lhs.X() + rhs.X(), lhs.Y() + rhs.Y());
 }
+template<class T, class U>
+inline Vector<T> operator +(const Vector<T> &lhs, const Vector<U> &rhs) {
+	return Vector<T>(lhs.X() + rhs.X(), lhs.Y() + rhs.Y());
+}
 
 template<class T>
 inline Vector<T> &operator +=(Vector<T> &lhs, const Vector<T> &rhs) {
 	return lhs = lhs + rhs;
 }
+template<class T, class U>
+inline Vector<T> &operator +=(Vector<T> &lhs, const Vector<U> &rhs) {
+	return lhs = lhs + rhs;
+}
 
 template<class T>
 inline Vector<T> operator -(const Vector<T> &lhs, const Vector<T> &rhs) {
 	return Vector<T>(lhs.X() - rhs.X(), lhs.Y() - rhs.Y());
 }
+template<class T, class U>
+inline Vector<T> operator -(const Vector<T> &lhs, const Vector<U> &rhs) {
+	return Vector<T>(lhs.X() - rhs.X(), lhs.Y() - rhs.Y());
+}
 
 template<class T>
 inline Vector<T> &operator -=(Vector<T> &lhs, const Vector<T> &rhs) {
 	return lhs = lhs - rhs;
 }
+template<class T, class U>
+inline Vector<T> &operator -=(Vector<T> &lhs, const Vector<U> &rhs) {
+	return lhs = lhs - rhs;
+}
 
 template<class T>
 inline Vector<T> operator -(const Vector<T> &v) {