Changeset 490 in Sophya for trunk/SophyaLib/NTools/hisprof.cc

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/hisprof.cc (modified) (3 diffs)

trunk/SophyaLib/NTools/hisprof.cc

@@ -303 +303 @@
 ///////////////////////////////////////////////////////////
 
-FIO_HProf::FIO_HProf()
-{
-dobj=new HProf;
-ownobj=true;
-}
-
-FIO_HProf::FIO_HProf(string const & filename) 
-{
-dobj=new HProf;
-ownobj=true; 
-Read(filename);
-}
-
-FIO_HProf::FIO_HProf(const HProf & obj) 
-{ 
-dobj = new HProf(obj);
-ownobj=true; 
-}
-
-FIO_HProf::FIO_HProf(HProf * obj) 
-{ 
-dobj = obj;
-ownobj=false; 
-}
-
-FIO_HProf::~FIO_HProf()
-{
-if (ownobj && dobj) delete dobj;
-}
-
-AnyDataObj* FIO_HProf::DataObj()
-{
-return(dobj);
-}
-
-void FIO_HProf::ReadSelf(PInPersist& is)
+
+void ObjFileIO<HProf>::ReadSelf(PInPersist& is)
 {
 char strg[256];
@@ -365 +331 @@
 
 // Ecriture de l'histogramme
-FIO_Histo fio_h((Histo&)*dobj);
-fio_h.Read(is);
-
+is >> (Histo&)(*dobj);
 return;
 }
 
-void FIO_HProf::WriteSelf(POutPersist& os) const
+void ObjFileIO<HProf>::WriteSelf(POutPersist& os) const
 {
 if (dobj == NULL)   return;
@@ -396 +360 @@
 
 // Ecriture de l'histogramme
-FIO_Histo fio_h((Histo&)*dobj);
-fio_h.Write(os);
+// FIO_Histo fio_h((Histo&)*dobj);
+// fio_h.Write(os);
+os << (Histo&)(*dobj);
 
 return;
 }
+
+#ifdef __CXX_PRAGMA_TEMPLATES__
+#pragma define_template ObjFileIO<HProf>
+#endif
+
+#if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
+template class ObjFileIO<HProf>;
+#endif