Changeset 1870 in Sophya for trunk/SophyaLib/BaseTools/dvlist.cc

Timestamp:

Jan 18, 2002, 12:25:29 PM (24 years ago)

Author:

ansari

Message:

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

File:

• trunk/SophyaLib/BaseTools/dvlist.cc (modified) (4 diffs)

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -163 +163 @@
     {
     case MuTyV::MTVInteger :
-      SetI((*it).first, (*it).second.elval.iv);
+      SetI((*it).first, (*it).second.elval.GetIntPart());
       break;
     case  MuTyV::MTVFloat : 
-      SetD((*it).first, (*it).second.elval.dv);
+      SetD((*it).first, (*it).second.elval.GetRealPart());
       break;
     case MuTyV::MTVComplex : 
-      SetZ((*it).first, complex<r_8>((*it).second.elval.dv, (*it).second.elval.dv_im));
+      SetZ((*it).first, complex<r_8>((*it).second.elval.GetRealPart(), (*it).second.elval.GetImagPart()));
       break;
     case MuTyV::MTVString : 
-      SetS((*it).first, *((*it).second.elval.strv));
+      SetS((*it).first, *((*it).second.elval.GetStringPointer()));
       break;
     default :
@@ -223 +223 @@
 if (it == mvlist.end())  return(def);
 #if defined(__GNUG__)
-complex<r_8> z;
-z = (*it).second.elval;
-return(z);
+// complex<r_8> z;
+// z = (*it).second.elval;
+return((*it).second.elval.ToComplexD());
 #else
 return( (complex<r_8>)(*it).second.elval );
@@ -407 +407 @@
     case MuTyV::MTVInteger :
       sprintf(buff, "%s = %ld (int) %s\n", (*it).first.substr(0,64).c_str(), 
-              (long)((*it).second.elval.iv), (*it).second.elcomm.substr(0,128).c_str());
+              (long)((*it).second.elval.GetIntPart()), (*it).second.elcomm.substr(0,128).c_str());
       break;
     case MuTyV::MTVFloat : 
       sprintf(buff, "%s = %.20g (double) %s\n", (*it).first.substr(0,64).c_str(), 
-              (*it).second.elval.dv, (*it).second.elcomm.substr(0,128).c_str());
+              (*it).second.elval.GetRealPart(), (*it).second.elcomm.substr(0,128).c_str());
       break;
     case MuTyV::MTVComplex : 
       sprintf(buff, "%s = %.20g %.20g i (complex) %s\n", (*it).first.substr(0,64).c_str(), 
-              (*it).second.elval.dv, (*it).second.elval.dv_im, (*it).second.elcomm.substr(0,128).c_str());
+              (*it).second.elval.GetRealPart(), (*it).second.elval.GetImagPart(), (*it).second.elcomm.substr(0,128).c_str());
       break;
     case MuTyV::MTVString : 
       sprintf(buff, "%s = %s (string) %s\n", (*it).first.substr(0,64).c_str(), 
-              (*it).second.elval.strv->substr(0,800).c_str(), (*it).second.elcomm.substr(0,128).c_str());
+              (*it).second.elval.GetStringPointer()->substr(0,800).c_str(), (*it).second.elcomm.substr(0,128).c_str());
       break;
     default :
@@ -490 +490 @@
   switch ((*it).second.elval.Type()) {
     case MuTyV::MTVInteger :
-      sprintf(buf,"I %s %ld\n", (*it).first.substr(0,64).c_str(), (long)((*it).second.elval.iv) );
+      sprintf(buf,"I %s %ld\n", (*it).first.substr(0,64).c_str(), (long)((*it).second.elval.GetIntPart()) );
       sfw = buf;  s.PutStr(sfw);
       break;
     case MuTyV::MTVFloat : 
-      sprintf(buf,"F %s %.20g\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.dv );
+      sprintf(buf,"F %s %.20g\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.GetRealPart() );
       sfw = buf;  s.PutStr(sfw);
       break;
     case MuTyV::MTVComplex : 
-      sprintf(buf,"Z %s %.20g %.20g\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.dv, 
-                                      (*it).second.elval.dv_im);
+      sprintf(buf,"Z %s %.20g %.20g\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.GetRealPart(), 
+                                      (*it).second.elval.GetImagPart());
       sfw = buf;  s.PutStr(sfw);
       break;
     case MuTyV::MTVString : 
-      sprintf(buf,"S %s %s\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.strv->substr(0,960).c_str() );
+      sprintf(buf,"S %s %s\n", (*it).first.substr(0,64).c_str(), (*it).second.elval.GetStringPointer()->substr(0,960).c_str() );
       sfw = buf;  s.PutStr(sfw);
       break;