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

Timestamp:

Mar 3, 2010, 9:44:38 PM (16 years ago)

Author:

ansari

Message:

Prise en charge de float 128 bits (r_16, complex<r_16>) par les NDataBlock<T> et PPersist, controlee par le flag de compilation SO_LDBLE128 defini ds machdefs.h , Reza 03/03/2010

File:

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

trunk/SophyaLib/BaseTools/mutyv.h

@@ -64 +64 @@
   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();
+  inline MuTyV & operator= (complex<r_4> const& v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = (r_8)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); }
-         const char*  operator= (const char* s);
-         string const& operator= (string const & s);
-         TimeStamp const& operator= (TimeStamp const & s);
+#ifdef SO_LDBLE128
+  inline MuTyV & operator= (r_16 v) { typ = MTVFloat; dv = (r_8)v; iv = (int_8)v;  dv_im = 0.;  return(*this); }
+  inline MuTyV & operator= (complex<r_16> const& v) { typ = MTVComplex; dv = (r_8)v.real();  dv_im = (r_8)v.imag();
+                                                    iv = (int_8)dv;  return(*this); }
+#endif
+  const char*  operator= (const char* s);
+  string const& operator= (string const & s);
+  TimeStamp const& operator= (TimeStamp const & s);
 
   inline operator uint_1() const { return((uint_1)iv); }
@@ -84 +89 @@
   inline operator complex<r_4>() const { return(complex<r_4>((r_4)dv, (r_4)dv_im)); }
   inline operator complex<r_8>() const { return(complex<r_8>(dv, dv_im)); }
+#ifdef SO_LDBLE128
+  inline operator r_16() const  { return((r_16)dv); }
+  inline operator complex<r_16>() const { return(complex<r_16>((r_16)dv, (r_16)dv_im)); }
+#endif
 
-         operator string() const ; 
-         operator TimeStamp() const ; 
+  operator string() const ; 
+  operator TimeStamp() const ; 
 
   inline uint_1 Convert(uint_1& x) const { x = (uint_1)iv; return x; }
@@ -102 +111 @@
   inline complex<r_8> Convert(complex<r_8> & x) const 
     { x = complex< r_8 > (dv, dv_im); return x; }
-  
+#ifdef SO_LDBLE128
+  inline r_16 Convert(r_16& x) const { x = (r_16)dv; return x; }
+  inline complex<r_16> Convert(complex<r_16> & x) const 
+    { x = complex< r_16 > ((r_16)dv, (r_16)dv_im); return x; }
+#endif  
   string&  Convert(string& x) const ; 
   TimeStamp& Convert(TimeStamp& x) const ;