Changeset 1871 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Jan 18, 2002, 12:32:51 PM (24 years ago)

Author:

ansari

Message:

Adaptations (2) pour compil avec g++ 3.0 - Reza 18/01/2002

Location:

trunk/SophyaLib/BaseTools

Files:

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

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -526 +526 @@
 int_8 j,iv,k;
 r_8 dv, dvi;
-complex<r_8> z;
 bool ok=true;
 buf[0] = '\0';
@@ -572 +571 @@
       dvi = atof(buf+k+1);
       key = buf+2;
-      z = complex<r_8>(dv, dvi);      
-      dobj->SetZ(key, z);
+      dobj->SetZ(key, complex<r_8>(dv, dvi));
       break;
     case  'S' :

trunk/SophyaLib/BaseTools/mutyv.h

@@ -73 +73 @@
   /* 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_4> ToComplexD() const { return(complex<r_8>(dv, dv_im)); }
+  inline complex<r_8> ToComplexD() const { return(complex<r_8>(dv, dv_im)); }
 
   inline MTVType Type() const { return typ; }