Changeset 490 in Sophya for trunk/SophyaLib/NTools/histos.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/histos.h (modified) (4 diffs)

trunk/SophyaLib/NTools/histos.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: histos.h,v 1.2 1999-05-19 15:58:00 ansari Exp $
+// $Id: histos.h,v 1.3 1999-10-21 15:25:47 ansari Exp $
 //
 
@@ -7 +7 @@
 #define HISTOS_SEEN
 
+#include "objfio.h"
+#include <iostream.h>
 #include <stdio.h>
 #include "peida.h"
@@ -18 +20 @@
 
 class Histo : public AnyDataObj {
-  friend class FIO_Histo;
+  friend class ObjFileIO<Histo>;
 public:
 
@@ -156 +158 @@
 };
 
-/////////////////////////////////////////////////////////////////////////
+
+inline POutPersist& operator << (POutPersist& os, Histo & obj)
+{ ObjFileIO<Histo> fio(&obj);  fio.Write(os);  return(os); }
+inline PInPersist& operator >> (PInPersist& is, Histo & obj)
+{ ObjFileIO<Histo> fio(&obj);  fio.Read(is);  return(is); }
+
 // Classe pour la gestion de persistance
-class FIO_Histo : public  PPersist  {
-public:
-  FIO_Histo();
-  FIO_Histo(string const & filename); 
-  FIO_Histo(const Histo & obj);
-  FIO_Histo(Histo * obj);
-  virtual ~FIO_Histo();
-  virtual AnyDataObj* DataObj();
-  inline operator Histo() { return(*dobj); }
-protected :
-  virtual void ReadSelf(PInPersist&);           
-  virtual void WriteSelf(POutPersist&) const;  
-  Histo * dobj;
-  bool ownobj;
-};
+// ObjFileIO<Histo>
+
 
 } // Fin du namespace