Changeset 490 in Sophya for trunk/SophyaLib/NTools/histos2.h

Timestamp:

Oct 21, 1999, 5:25:53 PM (26 years ago)

Author:

ansari

Message:

Merge avec PEIDA++ (~V 3.8) et nettoyage pour nouveau PPersist Reza+cmv 21/10/99

File:

• trunk/SophyaLib/NTools/histos2.h (modified) (2 diffs)

trunk/SophyaLib/NTools/histos2.h

@@ -23 +23 @@
 
 class Histo2D : public AnyDataObj {
-  friend class FIO_Histo2D;
+  friend class ObjFileIO<Histo2D>;
 public:
 
@@ -216 +216 @@
 /////////////////////////////////////////////////////////////////////////
 // Classe pour la gestion de persistance
-class FIO_Histo2D : public  PPersist  {
-public:
-  FIO_Histo2D();
-  FIO_Histo2D(string const & filename); 
-  FIO_Histo2D(const Histo2D & obj);
-  FIO_Histo2D(Histo2D * obj);
-  virtual ~FIO_Histo2D();
-  virtual AnyDataObj* DataObj();
-  inline operator Histo2D() { return(*dobj); }
-protected :
-  virtual void ReadSelf(PInPersist&);           
-  virtual void WriteSelf(POutPersist&) const;  
-  Histo2D * dobj;
-  bool ownobj;
-};
+
+inline POutPersist& operator << (POutPersist& os, Histo2D & obj)
+{ ObjFileIO<Histo2D> fio(&obj);  fio.Write(os);  return(os); }
+inline PInPersist& operator >> (PInPersist& is, Histo2D & obj)
+{ ObjFileIO<Histo2D> fio(&obj);  fio.Read(is);  return(is); }
+
+// Classe pour la gestion de persistance
+// ObjFileIO<Histo2D>
 
 } // Fin du namespace