Changeset 2926 in Sophya for trunk/SophyaLib

Timestamp:

Apr 3, 2006, 10:45:43 AM (19 years ago)

Author:

ansari

Message:

Ajout operateur de conversion int_2 , uint_4 pour instanciation TArray<int_2> - Reza 3/4/2006

File:

• trunk/SophyaLib/BaseTools/mutyv.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/mutyv.h

@@ -51 +51 @@
          MuTyV & operator= (MuTyV const & a);
   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_4 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_2 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); }
@@ -67 +69 @@
   inline operator uint_4() const { return((uint_4)iv); }
   inline operator uint_8() const { return((uint_8)iv); }
+  inline operator int_2()  const { return((int_2)iv); }
   inline operator int_4()  const { return((int_4)iv); }
   inline operator int_8()  const { return(iv); }
@@ -80 +83 @@
   inline uint_4 Convert(uint_4& x) const { x = (uint_4)iv; return x; }
   inline uint_8 Convert(uint_8& x) const { x = (uint_8)iv; return x; }
+  inline int_4 Convert(int_2& x) const { x = (int_2)iv; return x; }
   inline int_4 Convert(int_4& x) const { x = (int_4)iv; return x; }
   inline int_8 Convert(int_8& x) const { x = iv; return x; }