Changeset 923 in Sophya for trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

Timestamp:

Apr 13, 2000, 7:34:37 PM (25 years ago)

Author:

ansari

Message:

Compil SGI-CC , Probleme avec for(int i) repete - Reza 13/4/2000

File:

• trunk/SophyaExt/FitsIOServer/fitsxntuple.cc (modified) (19 diffs)

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -74 +74 @@
   nbcols = fn.NbColsFromFits();
   nbentries = 0;
-  for (int k=0; k<nbcols; k++) nbentries=max( nbentries, fn.NentriesFromFits(k) );
+  int k;
+  for (k=0; k<nbcols; k++) nbentries=max( nbentries, fn.NentriesFromFits(k) );
 
   //
@@ -88 +89 @@
   vector<int> IfitsCol;
   vector<int> SfitsCol;
-  for (int k=0; k<nbcols;k++)
+  for (k=0; k<nbcols;k++)
     {
       char ss= fn.ColTypeFromFits(k);
@@ -102 +103 @@
   char ** ColName = new char*[nbcols];
   int compt=0;
-  for (int k=0; k<DfitsCol.size(); k++)
+  for (k=0; k<DfitsCol.size(); k++)
     {
       ColName[compt] = new char[LONNOM+1]; 
@@ -108 +109 @@
       ColName[compt++][ LONNOM] =  '\0';
     }
-  for (int k=0; k<FfitsCol.size(); k++)
+  for (k=0; k<FfitsCol.size(); k++)
     {
       ColName[compt] = new char[LONNOM+1]; 
@@ -114 +115 @@
       ColName[compt++][ LONNOM] =  '\0';
     }
-  for (int k=0; k<IfitsCol.size(); k++)
+  for (k=0; k<IfitsCol.size(); k++)
     {
       ColName[compt] = new char[LONNOM+1]; 
@@ -120 +121 @@
       ColName[compt++][ LONNOM] =  '\0';
     }
-  for (int k=0; k<SfitsCol.size(); k++)
+  for (k=0; k<SfitsCol.size(); k++)
     {
       ColName[compt] = new char[LONNOM+1]; 
@@ -138 +139 @@
       (*dobj_)= XNTuple(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), SfitsCol.size(),ColName);
     }
-  for (int k=0; k<nbcols;k++) 
+  for (k=0; k<nbcols;k++) 
     {
       delete [] ColName[k];
@@ -155 +156 @@
       dcolumn_ = new double[nbentries];
       dligne = new r_8[DfitsCol.size()];
-      for (int k=0; k<DfitsCol.size(); k++) dligne[k]=0.;
+      for (k=0; k<DfitsCol.size(); k++) dligne[k]=0.;
     }
   else dligne=NULL;
@@ -163 +164 @@
       fcolumn_ = new float[nbentries];
       fligne = new r_4[FfitsCol.size()];
-      for (int k=0; k<FfitsCol.size(); k++) fligne[k]=0.;
+      for (k=0; k<FfitsCol.size(); k++) fligne[k]=0.;
     }
   else fligne=NULL;
@@ -171 +172 @@
       icolumn_ = new int[nbentries];
       iligne = new int_4[IfitsCol.size()];
-      for (int k=0; k<IfitsCol.size(); k++) iligne[k]=0;
+      for (k=0; k<IfitsCol.size(); k++) iligne[k]=0;
     } 
   else iligne=NULL;
@@ -178 +179 @@
       if (ccolumn_ != NULL)
         {
-          for (int k=0; k<dobj_->NEntry(); k++) delete [] ccolumn_[k];
+          for (k=0; k<dobj_->NEntry(); k++) delete [] ccolumn_[k];
           delete [] ccolumn_;
           ccolumn_ = NULL;
@@ -184 +185 @@
       ccolumn_ = new char*[nbentries];
       int  taille_des_chaines=0;
-      for (int k=0; k< SfitsCol.size(); k++)  taille_des_chaines = max( taille_des_chaines, fn.ColStringLengthFromFits(SfitsCol[k]) );
-      for (int k=0; k<nbentries;k++) ccolumn_[k]= new char[taille_des_chaines+1];
+      for (k=0; k< SfitsCol.size(); k++)  taille_des_chaines = max( taille_des_chaines, fn.ColStringLengthFromFits(SfitsCol[k]) );
+      for (k=0; k<nbentries;k++) ccolumn_[k]= new char[taille_des_chaines+1];
       cligne = new char*[SfitsCol.size()];
-      for (int k=0; k<SfitsCol.size(); k++) cligne[k]=" ";
+      for (k=0; k<SfitsCol.size(); k++) cligne[k]=" ";
     }
   else cligne=NULL;
 
-  for (int k=0; k<nbentries;k++) dobj_->Fill(dligne, fligne, iligne, cligne);
+  for (k=0; k<nbentries;k++) dobj_->Fill(dligne, fligne, iligne, cligne);
   delete [] dligne;
   delete [] fligne;
   delete [] iligne;
-  for (int k=0; k< SfitsCol.size(); k++) delete []  cligne[k];
+  for (k=0; k< SfitsCol.size(); k++) delete []  cligne[k];
   delete [] cligne; 
    
   compt=0;
-  for (int k=0; k<DfitsCol.size(); k++)
+  for (k=0; k<DfitsCol.size(); k++)
     {
       fn.GetBinTabFCol(dcolumn_, nbentries, DfitsCol[k]);
@@ -206 +207 @@
     }
   
-  for (int k=0; k<FfitsCol.size(); k++)
+  for (k=0; k<FfitsCol.size(); k++)
     {
       fn.GetBinTabFCol(fcolumn_,nbentries, FfitsCol[k]);
@@ -213 +214 @@
     }
               
-  for (int k=0; k<IfitsCol.size(); k++)
+  for (k=0; k<IfitsCol.size(); k++)
     {
       fn.GetBinTabFCol(icolumn_,nbentries, IfitsCol[k]);
@@ -220 +221 @@
     }
   
-  for (int k=0; k<SfitsCol.size(); k++)
+  for (k=0; k<SfitsCol.size(); k++)
     {
       fn.GetBinTabFCol(ccolumn_,nbentries, SfitsCol[k]);
@@ -247 +248 @@
   dvl.Print();
   char** Noms = new char*[ncols];   
-  for (int k=0; k< ncols; k++)
+  int k;
+  for (k=0; k< ncols; k++)
     {
       Noms[k]= new char[LONNOM+1];
@@ -254 +256 @@
    char* types=new char[ncols+1];
   int compt=0;
-  for (int k=0; k<dobj_->NDVar();k++)
+  for (k=0; k<dobj_->NDVar();k++)
     {
       types[compt++]='D'; 
     }
-  for (int k=0; k<dobj_->NFVar();k++)
+  for (k=0; k<dobj_->NFVar();k++)
     {
       types[compt++]='E'; 
     }
-  for (int k=0; k<dobj_->NIVar();k++)
+  for (k=0; k<dobj_->NIVar();k++)
     {
       types[compt++]='I'; 
     }
-  for (int k=0; k<dobj_->NSVar();k++)
+  for (k=0; k<dobj_->NSVar();k++)
     {
       types[compt++]='A'; 
@@ -272 +274 @@
   types[ncols]='\0';
   vector<int> StringSizes(dobj_->NSVar());
-  for (int k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
+  for (k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
   // la librairie fitsio ecrit colonne par colonne 
     fn.makeHeaderBntblOnFits(types, Noms, nrows, ncols, dvl, extname,StringSizes); 
-   for (int k=0; k< ncols; k++)
+   for (k=0; k< ncols; k++)
     {
       delete [] Noms[k];
@@ -282 +284 @@
    delete [] types;
   compt=0;  
-  for (int k=0; k<dobj_->NDVar();k++)
+  for (k=0; k<dobj_->NDVar();k++)
     {
       putColToFits(compt, dobj_->NEntry(), getColDFromObj(compt));
       compt++;
     }
-  for (int k=0; k<dobj_->NFVar();k++)
+  for (k=0; k<dobj_->NFVar();k++)
     {
       putColToFits(compt, dobj_->NEntry(), getColFFromObj(compt));
       compt++;
     }
-  for (int k=0; k<dobj_->NIVar();k++)
+  for (k=0; k<dobj_->NIVar();k++)
     {
       putColToFits(compt, dobj_->NEntry(), getColIFromObj(compt));
       compt++;
     }
-  for (int k=0; k<dobj_->NSVar();k++)
+  for (k=0; k<dobj_->NSVar();k++)
     {
       putColToFits(compt, dobj_->NEntry(), getColSFromObj(compt));