Changeset 179 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Dec 23, 1998, 5:04:15 PM (27 years ago)

Author:

ercodmgr

Message:

Petits pb de compil aCC Reza 23/12/98

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (11 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -976 +976 @@
 
 // Creation NTuple 
-const char* ntn[4] = {"expx","expy","expex","expey",};
+char* ntn[4] = {"expx","expy","expex","expey",};
 NTuple* nt = NULL;
 bool haserr = false;
@@ -1016 +1016 @@
 if (!myImgApp)  return; 
 
-const char* ntn[3] = {"expx","expy","expz"};
+char* ntn[3] = {"expx","expy","expz"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple
 
@@ -1063 +1063 @@
 if ( (oh != NULL) && (oh->ClassId() == ClassId_Histo1D) )  h1 = (Histo*)oh;  // Pas de remise a zero ! h1->Zero();
 else {
-  const char* ntn[2]= {"hxval", "hwt"};
+  char* ntn[2]= {"hxval", "hwt"};
   nt = new NTuple(2,ntn);  // Creation NTuple 
   }
@@ -1112 +1112 @@
 if ( (oh != NULL) && (oh->ClassId() == ClassId_Histo2D) )  h2 = (Histo2D*)oh;  // Pas de remise a zero ! h2->Zero();
 else {
-  const char* ntn[3]= {"hxval", "hyval", "hwt"};
+  char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
   }
@@ -1173 +1173 @@
 if( (oh!=NULL) && (oh->ClassId()== ClassId_HProf) )  hprof = (HProf*)oh;
 else {
-  const char* ntn[3]= {"hxval", "hyval", "hwt"};
+  char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
 }
@@ -1218 +1218 @@
 if (nomvec.length() < 1) nomvec = "VecFill";
 
-const char* ntn[2]= {"vecval", "vecwt"};
+char* ntn[2]= {"vecval", "vecwt"};
 nt = new NTuple(1,ntn);  // Creation NTuple
  
@@ -1270 +1270 @@
   }  
 if (nt == NULL) {
-  const char* ntn[4]= {"x", "y","z","t"};
+  char* ntn[4]= {"x", "y","z","t"};
   nt = new NTuple(4,ntn);  // Creation NTuple 
   fgnnt = true;
@@ -1357 +1357 @@
 
 // Creation NTuple Buffer
-const char* ntn[4]= {"x","y","f","e"};
+char* ntn[4]= {"x","y","f","e"};
 NTuple*nt = new NTuple(4,ntn);
 
@@ -1884 +1884 @@
   Gauss1DPol* myf;
   if(degre>=0) myf = new Gauss1DPol((unsigned int)degre,((O.polcx)?true:false));
-       else    myf = new Gauss1DPol(((O.polcx)?true:false));
+  else { bool bfg = (O.polcx)?true:false;   myf = new Gauss1DPol(bfg); }
   myfunc = myf;
 
@@ -1894 +1894 @@
   GaussN1DPol* myf;
   if(degre>=0) myf = new GaussN1DPol((unsigned int)degre,((O.polcx)?true:false));
-       else    myf = new GaussN1DPol(((O.polcx)?true:false));
+  else  { bool bfg = (O.polcx)?true:false;   myf = new GaussN1DPol(bfg); }
   myfunc = myf;
 
@@ -2031 +2031 @@
 if (fft.NData() < 1)  return;
 
-const char* ntn[3] = {"refc", "imfc", "pfc"};
+char* ntn[3] = {"refc", "imfc", "pfc"};
 NTuple* nt = new NTuple(3,ntn);  // Creation NTuple 
 Vector* vf = new Vector(fft.NData()/2);