Changeset 3572 in Sophya for trunk/SophyaLib/SUtils

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

Location:

trunk/SophyaLib/SUtils

Files:

• datacards.cc (modified) (5 diffs)
• strutilxx.cc (modified) (2 diffs)
• utils.cc (modified) (2 diffs)

trunk/SophyaLib/SUtils/datacards.cc

@@ -1 +1 @@
 //
-// $Id: datacards.cc,v 1.10 2004-09-10 09:54:48 cmv Exp $
+// $Id: datacards.cc,v 1.11 2009-02-07 21:49:59 cmv Exp $
 //
 //
@@ -217 +217 @@
 DataCards::GetKey(int num) const
 {
-  if ((num < 0) || (num >= cards.size()) )  return("");
+  if ((num < 0) || (num >= (int)cards.size()) )  return("");
   int k = 0;
   CardList::const_iterator i;
@@ -234 +234 @@
   DataCards::CardList::const_iterator it = FindKeyC(key);
   if (it == cards.end()) return(rs);
-  for (int k=0; k<(*it).tokens.size(); k++) {
+  for (size_t k=0; k<(*it).tokens.size(); k++) {
     rs += ' ';  rs += (*it).tokens[k];
   }
@@ -246 +246 @@
   DataCards::CardList::const_iterator it = FindKeyC(key);
   if (it == cards.end()) return(def);
-  if ( (numero < 0) || (numero >= (*it).tokens.size()) )  return def;
+  if ( (numero < 0) || (numero >= (int)((*it).tokens.size())) )  return def;
   return (*it).tokens[numero];
 }
@@ -308 +308 @@
 DataCards::ApplyPF(CrdPF & cpf, string const& key, string const& toks)
 {
-int l,lk;
+size_t l,lk;
 int rc = 0;
 // On verifie si le "pattern" correspond

trunk/SophyaLib/SUtils/strutilxx.cc

@@ -13 +13 @@
 // considering char "sep" as a separator.
 // Vector is filled from its end (no reset done).
-// Tp write a "sep" char, use \'sep'
+// To write a "sep" char, use \'sep'
 // Warning: separator "sep" could not be set to '\'
 // Ex: sep=' ': s="aaa   bbb cc d " -> vs=(aaa,bbb,cc,d)
@@ -55 +55 @@
 // - Fill "vs" at the end: NO RESET IS DONE
 // - If ',' is the separator, ",,," is c
-// That routine is much more rapid than FillVStringFrString altouch less general
+// That routine is much more rapid than FillVStringFrString although less general
 //           (ex no '\' gestion is done)
 {
  uint_4 ls = s.size();
  if(ls<=0) return;
- bool sep_non_blanc = (separator==' ')? false: true;
+ //bool sep_non_blanc = (separator==' ')? false: true;
  char *str = new char[ls+2];
 

trunk/SophyaLib/SUtils/utils.cc

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: utils.cc,v 1.2 2004-09-10 09:54:49 cmv Exp $
+// $Id: utils.cc,v 1.3 2009-02-07 21:49:59 cmv Exp $
 //
 
@@ -15 +15 @@
   int i;   // THINK C ne veut pas du int i dans chaque for...
   if (dest < source)
-    for (i=0; i<n; i++)
+    for (i=0; i<(int)n; i++)
       ((char*)dest)[i] = ((char*)source)[i];
   else