Changeset 827 in Sophya

Timestamp:

Apr 6, 2000, 6:39:00 PM (25 years ago)

Author:

ansari

Message:

Suppression de warning compil dvlist (format printf) - Reza 6/4/2000

Location:

trunk/SophyaLib/BaseTools

Files:

• dvlist.cc (modified) (2 diffs)
• dvlist.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -284 +284 @@
     {
     case 'I' :
-      sprintf(buff, "%s = %d (int) %s\n", (*it).first.substr(0,64).c_str(), 
-              (*it).second.elval.mtv.iv, (*it).second.elcomm.substr(0,128).c_str());
+      sprintf(buff, "%s = %ld (int) %s\n", (*it).first.substr(0,64).c_str(), 
+              (long)((*it).second.elval.mtv.iv), (*it).second.elcomm.substr(0,128).c_str());
       break;
     case 'D' : 
@@ -359 +359 @@
   switch ((*it).second.elval.typ) {
     case 'I' :
-      sprintf(buf,"I %s %d", (*it).first.substr(0,64).c_str(), (*it).second.elval.mtv.iv );
+      sprintf(buf,"I %s %ld", (*it).first.substr(0,64).c_str(), (long)((*it).second.elval.mtv.iv) );
       sfw = buf;  s.PutStr(sfw);
       break;

trunk/SophyaLib/BaseTools/dvlist.h

@@ -25 +25 @@
   int_8 iv;
   r_8 dv;
-  char strv[31];
+  char strv[39];
   } mtv; 
   char typ;
@@ -32 +32 @@
 
   inline MuTyV() { typ = 'I'; mtv.iv = 0;  mtv.dv = 0.;  mtv.strv[0] ='\0'; }
+  inline MuTyV(MuTyV const & a) { typ = a.typ; mtv = a.mtv; }
   inline MuTyV(int_4 i) { typ = 'I'; mtv.iv = (int_8)i; mtv.dv = 0.;  mtv.strv[0] ='\0'; }
   inline MuTyV(int_8 i) { typ = 'I'; mtv.iv = i; mtv.dv = 0.;  mtv.strv[0] ='\0'; }
   inline MuTyV(r_4 f) { typ = 'D'; mtv.dv = (r_8)f;  mtv.iv = 0;  mtv.strv[0] ='\0'; }
   inline MuTyV(r_8 d) { typ = 'D'; mtv.dv = d; mtv.iv = 0;  mtv.strv[0] ='\0'; }
-  inline MuTyV(char const* s)  { typ = 'S'; strncpy(mtv.strv, s, 31); mtv.strv[30] = '\0'; }
-  inline MuTyV(string const& s) { typ = 'S'; strncpy(mtv.strv, s.c_str(), 31); mtv.strv[30] = '\0'; }
+  inline MuTyV(char const* s)  { typ = 'S'; strncpy(mtv.strv, s, 39); mtv.strv[38] = '\0'; }
+  inline MuTyV(string const& s) { typ = 'S'; strncpy(mtv.strv, s.c_str(), 39); mtv.strv[38] = '\0'; }
+  inline MuTyV & operator= (MuTyV const & a) { typ = a.typ; mtv = a.mtv; return(*this); }
   inline int_4  operator= (int_4 v)  { typ = 'I'; mtv.iv = (int_8)v; return(v); }
   inline int_8  operator= (int_8 v)  { typ = 'I'; mtv.iv = v; return(v); }
   inline r_4  operator= (r_4 v)  { typ = 'D'; mtv.dv = (r_8)v; return(v); }
   inline r_8 operator= (r_8 v) { typ = 'D'; mtv.dv = v; return(v); }
-  inline char*  operator= (char* s)  { typ = 'S'; strncpy(mtv.strv, s, 31); 
-                                       mtv.strv[30] = '\0';  return(s); }
-  inline string& operator= (string& s)    { typ = 'S'; strncpy(mtv.strv, s.c_str(), 31); 
-                                            mtv.strv[30] = '\0'; return(s); }
+  inline char*  operator= (char* s)  { typ = 'S'; strncpy(mtv.strv, s, 39); 
+                                       mtv.strv[38] = '\0';  return(s); }
+  inline string& operator= (string& s)    { typ = 'S'; strncpy(mtv.strv, s.c_str(), 39); 
+                                            mtv.strv[38] = '\0'; return(s); }
 
   inline operator int_4() { if (typ == 'I')  return((int_4)mtv.iv);
@@ -60 +62 @@
                             else return(atof(mtv.strv)); }
   inline operator string() { char *ss=myStrBuf;
-                            if (typ == 'I')  sprintf(ss,"%ld", mtv.iv);
+                            if (typ == 'I')  sprintf(ss,"%ld", (long)mtv.iv);
                             else if (typ == 'D') sprintf(ss,"%.20g", mtv.dv);
                             else ss = mtv.strv;