Changeset 3572 in Sophya for trunk/SophyaPI/PIext/nomgfdadapter.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

• trunk/SophyaPI/PIext/nomgfdadapter.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/nomgfdadapter.cc

@@ -9 +9 @@
 #include "pipodrw.h"
 
-#ifndef SANS_EVOLPLANCK
 #include "objfitter.h"
-#endif
 
 //-------------------------------------------------------------------------
@@ -53 +51 @@
 void NOMAdapter_GeneralFitData::SavePPF(POutPersist& pos, string const & nom)
 {
-#ifdef SANS_EVOLPLANCK
-string tag = nom;  // A cause de const
-mG->Write(pos,0,tag);
-#else
 ObjFileIO<GeneralFitData> fio(mG);
 fio.Write(pos, nom);
-#endif
 }
 
@@ -113 +106 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitResidus(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitResidus(*mG,mfit));
-#endif
 return g;
 }
@@ -124 +113 @@
 {
 GeneralFitData* g = NULL;
-#ifdef SANS_EVOLPLANCK
-g = mG->FitFunction(mfit); 
-#else
 g = new GeneralFitData(ObjectFitter::FitFunction(*mG,mfit));
-#endif
 return g;
 }