Changeset 3572 in Sophya for trunk/SophyaPI/PIext/pisiadw.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/pisiadw.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/pisiadw.cc

@@ -244 +244 @@
 
 bool ok = true;
-#ifdef SANS_EVOLPLANCK
-TRY {
-  mPin = new PInPersist(flnm);
-}  CATCH(merr) 
-  { printf("ObjMgrWind::SetFile Exception= %ld (%s) \n", (long)merr, PeidaExc(merr)); 
-  ok = false; } ENDTRY;
-#else
 try {
   mPin = new PInPersist(flnm);
@@ -258 +251 @@
   ok = false;
   }
-#endif
 
 if (!ok) { mPin = NULL;  dap->SetReady(); return; }
 
 int nbtags = 0;
-#ifdef SANS_EVOLPLANCK
-nbtags = mPin->NbTags();
-#else 
 nbtags = mPin->NbNameTags();
-#endif
 
 if (nbtags < 1) {
@@ -282 +270 @@
 objlist->SetBorderWidth(2);
 
-
-#ifdef SANS_EVOLPLANCK
-for(i=0; i<mPin->NbTags(); i++) {
-  key = mPin->TagKey(i, cid, ln);  // $CHECK$ non-const & reference initialized to temporary, car int -> long&
-  if (ln <= 0)  nom = "?";
-  else { strncpy(noms, mPin->TagName(i).c_str(), 31);  noms[31] = '\0'; nom = noms; }
-  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, dap->ObjMgr()->GetServiceObj()->PClassIdToClassName(cid), key);
-  //  sprintf(strg, "%s  (T=%s, Key=%d)",  nom, " DataObject ?", key);  Attention SANS_EVOLPLANCK
-  objlist->AppendItem(strg, 5000+i);
-}
-#else
 string tn;
 for(i=0; i<mPin->NbNameTags(); i++) {
@@ -298 +275 @@
   objlist->AppendItem(tn.c_str(), 5000+i);
 }
-#endif
 
 }