Changeset 1875 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Jan 20, 2002, 12:43:18 AM (24 years ago)

Author:

ansari

Message:

Suppression methode MuTyV:;ToComplex() - Reza 19/01/2002

Location:

trunk/SophyaLib/BaseTools

Files:

• dvlist.cc (modified) (1 diff)
• mutyv.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -223 +223 @@
 if (it == mvlist.end())  return(def);
 #if defined(__GNUG__)
-// complex<r_8> z;
-// z = (*it).second.elval;
-return((*it).second.elval.ToComplexD());
+complex<r_8> z;
+z = (*it).second.elval;
+return(z);
 #else
 return( (complex<r_8>)(*it).second.elval );

trunk/SophyaLib/BaseTools/mutyv.h

@@ -60 +60 @@
 
   inline operator uint_2() const { return((uint_2)iv); }
+  inline operator uint_4() const { return((uint_4)iv); }
   inline operator uint_8() const { return((uint_8)iv); }
   inline operator int_4()  const { return((int_4)iv); }
@@ -69 +70 @@
 
          operator string() const ; 
-
-  /* g++ a du mal avec les operateurs de conversion complex<T>   */
-  /* On definit donc les deux methodes de conversion nommees explicitement */
-  inline complex<r_4> ToComplexF() const { return(complex<r_4>((r_4)dv, (r_4)dv_im)); }
-  inline complex<r_8> ToComplexD() const { return(complex<r_8>(dv, dv_im)); }
 
   inline MTVType Type() const { return typ; }