Changeset 1870 in Sophya for trunk/SophyaLib/BaseTools/mutyv.h

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/mutyv.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/mutyv.h

@@ -35 +35 @@
   inline MuTyV(r_4 f) { typ = MTVFloat; dv = (r_8)f; iv = (int_8)f;  dv_im = 0.;  strv = NULL; } 
   inline MuTyV(r_8 d) { typ = MTVFloat; dv = d;  iv = (int_8)d;  dv_im = 0.;  strv = NULL; } 
-  inline MuTyV(complex<r_4> z) { typ = MTVComplex; dv = (r_8)z.real();  dv_im = z.imag();  
+  inline MuTyV(complex<r_4> const& z) { typ = MTVComplex; dv = (r_8)z.real();  dv_im = z.imag();  
                                  iv = (int_8)dv;  strv = NULL; } 
-  inline MuTyV(complex<r_8> z) { typ = MTVComplex; dv = z.real();  dv_im = z.imag();  
+  inline MuTyV(complex<r_8> const& z) { typ = MTVComplex; dv = z.real();  dv_im = z.imag();  
                                  iv = (int_8)dv;  strv = NULL; } 
 
@@ -45 +45 @@
          ~MuTyV();
  
-  inline MTVType Type() const { return typ; }
-
          MuTyV & operator= (MuTyV const & a);
-  inline uint_2  operator= (uint_2 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(v); }
-  inline uint_2  operator= (uint_8 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(v); }
-  inline int_4  operator= (int_4 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(v); }
-  inline int_8  operator= (int_8 v)  { typ = MTVInteger; iv = v;  dv = (r_8)v; dv_im = 0.;  return(v); }
-  inline r_4  operator= (r_4 v)  { typ = MTVFloat; dv = (r_8)v; iv = (int_8)v;  dv_im = 0.;  return(v); }
-  inline r_8  operator= (r_8 v) { typ = MTVFloat; dv = v; iv = (int_8)v;  dv_im = 0.;  return(v); }
-  inline complex<r_4> operator= (complex<r_4> v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = v.imag();
-                                                    iv = (int_8)dv;  return(v); }
-  inline complex<r_8> operator= (complex<r_8> v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = v.imag();
-                                                    iv = (int_8)dv;  return(v); }
+  inline MuTyV & operator= (uint_2 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (uint_8 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (int_4 v)  { typ = MTVInteger; iv = (int_8)v;  dv = (r_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (int_8 v)  { typ = MTVInteger; iv = v;  dv = (r_8)v; dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (r_4 v)  { typ = MTVFloat; dv = (r_8)v; iv = (int_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (r_8 v) { typ = MTVFloat; dv = v; iv = (int_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (complex<r_4> const& v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = v.imag();
+                                                    iv = (int_8)dv;  return(*this); }
+  inline MuTyV & operator= (complex<r_8> const& v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = v.imag();
+                                                    iv = (int_8)dv;  return(*this); }
          char*  operator= (char* s);
          string& operator= (string& s);
@@ -72 +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_4> ToComplexD() const { return(complex<r_8>(dv, dv_im)); }
+
+  inline MTVType Type() const { return typ; }
+  inline int_8   GetIntPart() const { return iv; }
+  inline r_8     GetRealPart() const { return dv; }
+  inline r_8     GetImagPart() const { return dv_im; }
+  inline string*  GetStringPointer() const { return (strv); } 
+
+protected:
   int_8 iv;
   r_8 dv;