[Getfem-commits] r5220 - /trunk/getfem/src/gmm/gmm_vector.h

[Yves . Renard]

Author: renard
Date: Wed Jan  6 17:33:42 2016
New Revision: 5220

URL: http://svn.gna.org/viewcvs/getfem?rev=5220&view=rev
Log:
cancel changes

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

Modified: trunk/getfem/src/gmm/gmm_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_vector.h?rev=5220&r1=5219&r2=5220&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_vector.h   (original)
+++ trunk/getfem/src/gmm/gmm_vector.h   Wed Jan  6 17:33:42 2016
@@ -57,8 +57,6 @@
     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; }
@@ -99,30 +97,26 @@
   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
-  // 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
+  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
   typename number_traits<T>::magnitude_type
   abs(const ref_elt_vector<T, V> &re) { return gmm::abs(T(re)); }