Changeset 3750 in Sophya for trunk/SophyaLib/BaseTools/ppfbinstream.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/ppfbinstream.h (modified) (6 diffs)

trunk/SophyaLib/BaseTools/ppfbinstream.h

@@ -142 +142 @@
   void   GetZ8   (complex<r_8> &);
   void   GetZ8s  (complex<r_8> *, size_t);
+#ifdef SO_LDBLE128
+  void   GetR16  (r_16&);
+  void   GetR16s (r_16*, size_t);
+  void   GetZ16  (complex<r_16> &);
+  void   GetZ16s (complex<r_16> *, size_t);
+#endif
   
   inline void   Get(char&   c) {GetByte(c);}
@@ -170 +176 @@
   inline void   Get(complex<r_4> * x, size_t n) { GetZ4s(x, n); }
   inline void   Get(complex<r_8> * x, size_t n) { GetZ8s(x, n); }
-  
+#ifdef SO_LDBLE128
+  inline void   Get(r_16&   x) {GetR16(x);}
+  inline void   Get(r_16*   x, size_t n) {GetR16s(x,n);}
+  inline void   Get(complex<r_16> & x) {GetZ16(x);}
+  inline void   Get(complex<r_16> * x, size_t n) { GetZ16s(x, n); }
+#endif  
   // Reading a list (table) of position tags
   void    GetPosTagTable(int_8*, size_t);
@@ -184 +195 @@
   void   SkipItem(bool fgrdi=true, unsigned char itag=0);
 
-  void   CheckTag   (short datasz, short datatype);
-  void   CheckArrayTag(short datasz, size_t sz, short datatype);
+  void   CheckTag   (unsigned char datasz, unsigned char datatype);
+  void   CheckArrayTag(unsigned char datasz, size_t sz, unsigned char datatype);
   void   GetTypeTag (unsigned char& c);
   void   GetRawByte (char& c);
@@ -245 +256 @@
   void PutZ8   (complex<r_8>);
   void PutZ8s  (complex<r_8> const*, size_t);
-  
+#ifdef SO_LDBLE128
+  void PutR16  (r_16);
+  void PutR16s (r_16 const*, size_t);
+  void PutZ16  (complex<r_16>);
+  void PutZ16s (complex<r_16> const*, size_t);
+#endif  
   
   void   Put(char   c) {PutByte(c);}
@@ -264 +280 @@
   void   Put(complex<r_4> const*    x, size_t n) {PutZ4s(x,n);}
   void   Put(complex<r_8> const*    x, size_t n) {PutZ8s(x,n);}
+#ifdef SO_LDBLE128
+  void   Put(r_16   x) {PutR16(x);}
+  void   Put(r_16 const*   x, size_t n) {PutR16s(x,n);}
+  void   Put(complex<r_16>  x) {PutZ16(x);}
+  void   Put(complex<r_16> const*   x, size_t n) {PutZ16s(x,n);}
+#endif
   void   Put(uint_1 const* x, size_t n) {PutU1s(x,n);}
   void   Put(int_1 const*  x, size_t n) {PutI1s(x,n);}
@@ -284 +306 @@
   void     WriteNameTagTableV2();
 
-  void     PutArrayTag(short datasz, size_t sz, short datatype);
+  void     PutArrayTag(unsigned char datasz, size_t sz, unsigned char datatype);
   void     PutRawByte (char);
   void     PutRawUByte (unsigned char);