From 038eb8d75e61c73786100dce649832e8dbff1be3 Mon Sep 17 00:00:00 2001
From: Sylvain Thery <thery@unistra.fr>
Date: Fri, 8 Feb 2013 17:18:36 +0100
Subject: [PATCH] resolve pb of x*V with vector_gen

---
 include/Geometry/vector_gen.h   | 13 ++++++++++---
 include/Geometry/vector_gen.hpp |  7 ++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/Geometry/vector_gen.h b/include/Geometry/vector_gen.h
index 8ebed15b0..d1b1e11d9 100644
--- a/include/Geometry/vector_gen.h
+++ b/include/Geometry/vector_gen.h
@@ -117,7 +117,11 @@ public:
 	
 	Vector<DIM, T> operator-() const ;
 
-	Vector<DIM, T> operator*(T a) const ;
+ 	Vector<DIM, T> operator*(T a) const ;
+	
+// 	template <typename T2>
+// 	Vector<DIM, T> operator*(T2 a) const ;
+	
 
 	Vector<DIM, T> operator/(T a) const ;
 
@@ -208,8 +212,8 @@ bool isNull(T x, int precision = 0) ;
 template <typename T>
 bool isNull2(T x, int precision = 0) ;
 
-template <unsigned int DIM, typename T>
-Vector<DIM, T> operator*(T a, const Vector<DIM, T>& v) ;
+// template <unsigned int DIM, typename T>
+// Vector<DIM, T> operator*(T a, const Vector<DIM, T>& v) ;
 
 template <unsigned int DIM, typename T>
 Vector<DIM, T> operator/(T a, const Vector<DIM, T>& v) ;
@@ -222,6 +226,9 @@ T tripleProduct(const Vector<DIM, T>& v1, const Vector<DIM, T>& v2, const Vector
 template <unsigned int DIM, typename T>
 Vector<DIM, T> slerp(const Vector<DIM, T> &v1, const Vector<DIM, T> &v2, const T &t) ;
 
+template <unsigned int DIM, typename T, typename T2>
+Vector<DIM, T> operator*(T2 b, const Vector<DIM, T>& v);
+
 
 /**********************************************/
 /*           SOME USEFUL TYPEDEFS             */
diff --git a/include/Geometry/vector_gen.hpp b/include/Geometry/vector_gen.hpp
index bb6dbc5a7..036029fc7 100644
--- a/include/Geometry/vector_gen.hpp
+++ b/include/Geometry/vector_gen.hpp
@@ -405,12 +405,13 @@ inline bool isNull2(T x, int precision)
 		return (isNull(x, - (precision * precision))) ;
 }
 
-template <unsigned int DIM, typename T>
-inline Vector<DIM, T> operator*(T a, const Vector<DIM, T>& v)
+template <unsigned int DIM, typename T, typename T2>
+inline Vector<DIM, T> operator*(T2 b, const Vector<DIM, T>& v)
 {
-	return v * a ;
+	return v * T(b) ;
 }
 
+
 template <unsigned int DIM, typename T>
 inline Vector<DIM, T> operator/(T a, const Vector<DIM, T>& v)
 {
-- 
GitLab