[Getfem-commits] r5219 - in /trunk/getfem/src/gmm: gmm_def.h gmm_vector.h

[Yves . Renard]

Author: renard
Date: Wed Jan  6 17:22:16 2016
New Revision: 5219

URL: http://svn.gna.org/viewcvs/getfem?rev=5219&view=rev
Log:
delete some definitions causing problems

Modified:
    trunk/getfem/src/gmm/gmm_def.h
    trunk/getfem/src/gmm/gmm_vector.h

Modified: trunk/getfem/src/gmm/gmm_def.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_def.h?rev=5219&r1=5218&r2=5219&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_def.h      (original)
+++ trunk/getfem/src/gmm/gmm_def.h      Wed Jan  6 17:22:16 2016
@@ -409,13 +409,6 @@
 # define magnitude_of_linalg(M) typename number_traits<typename \
                     linalg_traits<M>::value_type>::magnitude_type
   
-  template<typename T> inline std::complex<T> operator*(const std::complex<T>& 
a, int b) {
-    return a*T(b);
-  }
-  template<typename T> inline std::complex<T> operator*(int b, const 
std::complex<T>& a) {
-    return a*T(b);
-  }
-
   /* ******************************************************************** */
   /*  types promotion                                                     */
   /* ******************************************************************** */

Modified: trunk/getfem/src/gmm/gmm_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_vector.h?rev=5219&r1=5218&r2=5219&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_vector.h   (original)
+++ trunk/getfem/src/gmm/gmm_vector.h   Wed Jan  6 17:22:16 2016
@@ -57,6 +57,8 @@
     public :
 
     operator T() const { return pm->r(l); }
+    operator std::complex<T>() const { return std::complex<T>(pm->r(l)); }
+    
     ref_elt_vector(V *p, size_type ll) : pm(p), l(ll) {}
     inline ref_elt_vector &operator =(T v)
       { (*pm).w(l,v); return *this; }
@@ -72,12 +74,12 @@
       { (*pm).w(l,(*pm).r(l) * v); return *this; }
     inline ref_elt_vector &operator =(const ref_elt_vector &re)
       { *this = T(re); return *this; }
-    T operator +()    { return  T(*this);   } // necessary for unknow reason
-    T operator -()    { return -T(*this);   } // necessary for unknow reason
-    T operator +(T v) { return T(*this)+ v; } // necessary for unknow reason
-    T operator -(T v) { return T(*this)- v; } // necessary for unknow reason
-    T operator *(T v) { return T(*this)* v; } // necessary for unknow reason
-    T operator /(T v) { return T(*this)/ v; } // necessary for unknow reason
+    T operator +()    { return  T(*this);   }
+    T operator -()    { return -T(*this);   }
+    T operator +(T v) { return T(*this)+ v; }
+    T operator -(T v) { return T(*this)- v; }
+    T operator *(T v) { return T(*this)* v; }
+    T operator /(T v) { return T(*this)/ v; }
   };  
   
   
@@ -97,26 +99,30 @@
   template<typename T, typename V> inline
   T &operator /=(T &v, const ref_elt_vector<T, V> &re)
   { v /= T(re); return v; }
-  template<typename T, typename V> inline
-  T operator +(const ref_elt_vector<T, V> &re) { return T(re); }
-  template<typename T, typename V> inline
-  T operator -(const ref_elt_vector<T, V> &re) { return -T(re); }
-  template<typename T, typename V> inline
-  T operator +(const ref_elt_vector<T, V> &re, T v) { return T(re)+ v; }
-  template<typename T, typename V> inline
-  T operator +(T v, const ref_elt_vector<T, V> &re) { return v+ T(re); }
-  template<typename T, typename V> inline
-  T operator -(const ref_elt_vector<T, V> &re, T v) { return T(re)- v; }
-  template<typename T, typename V> inline
-  T operator -(T v, const ref_elt_vector<T, V> &re) { return v- T(re); }
-  template<typename T, typename V>  inline
-  T operator *(const ref_elt_vector<T, V> &re, T v) { return T(re)* v; }
-  template<typename T, typename V> inline
-  T operator *(T v, const ref_elt_vector<T, V> &re) { return v* T(re); }
-  template<typename T, typename V> inline
-  T operator /(const ref_elt_vector<T, V> &re, T v) { return T(re)/ v; }
-  template<typename T, typename V> inline
-  T operator /(T v, const ref_elt_vector<T, V> &re) { return v/ T(re); }
+  // template<typename T, typename V> inline
+  // T operator +(const ref_elt_vector<T, V> &re) { return T(re); }
+  // template<typename T, typename V> inline
+  // T operator -(const ref_elt_vector<T, V> &re) { return -T(re); }
+  // template<typename T, typename V> inline
+  // T operator +(const ref_elt_vector<T, V> &re, T v) { return T(re)+ v; }
+  // template<typename T, typename V> inline
+  // T operator +(T v, const ref_elt_vector<T, V> &re) { return v+ T(re); }
+  // template<typename T, typename V> inline
+  // T operator -(const ref_elt_vector<T, V> &re, T v) { return T(re)- v; }
+  // template<typename T, typename V> inline
+  // T operator -(T v, const ref_elt_vector<T, V> &re) { return v- T(re); }
+  // template<typename T, typename V>  inline
+  // T operator *(const ref_elt_vector<T, V> &re, T v) { return T(re)* v; }
+  // template<typename T, typename V> inline
+  // T operator *(T v, const ref_elt_vector<T, V> &re) { return v* T(re); }
+  
+  // template<typename T, typename V> inline
+  // std::complex<T> operator *(std::complex<T> v, const ref_elt_vector<T, V> 
&re) { return v* T(re); }
+ 
+  // template<typename T, typename V> inline
+  // T operator /(const ref_elt_vector<T, V> &re, T v) { return T(re)/ v; }
+  // template<typename T, typename V> inline
+  // T operator /(T v, const ref_elt_vector<T, V> &re) { return v/ T(re); }
   template<typename T, typename V> inline
   typename number_traits<T>::magnitude_type
   abs(const ref_elt_vector<T, V> &re) { return gmm::abs(T(re)); }