Changeset 3572 in Sophya for trunk/SophyaLib/TArray

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/TArray

Files:

• basarr.cc (modified) (1 diff)
• basarr.h (modified) (1 diff)
• triangmtx.h (modified) (1 diff)
• utilarr.cc (modified) (4 diffs)

trunk/SophyaLib/TArray/basarr.cc

@@ -22 +22 @@
 
 // Variables statiques globales
-char * BaseArray::ck_op_msg_[6] =
+const char * BaseArray::ck_op_msg_[6] =
      {"???", "Size(int )", "IsPacked(int )"
      ,"Stride(int )", "ElemCheckBound()", "operator()" };

trunk/SophyaLib/TArray/basarr.h

@@ -200 +200 @@
   DVList* mInfo;    //!< Infos (variables) attached to the array
 
-  static char * ck_op_msg_[6]; //!< Operation messages for CheckDI() CheckBound()
+  static const char * ck_op_msg_[6]; //!< Operation messages for CheckDI() CheckBound()
   static sa_size_t max_nprt_; //!< maximum number of printed elements
   static int_4 prt_lev_;  //!< Print level

trunk/SophyaLib/TArray/triangmtx.h

@@ -32 +32 @@
 
 //! Default constructor
-TriangularMatrix()   {;};
+TriangularMatrix()
+  : long_diag_(0)
+{
+}
+
 //! instanciate a triangular matrix from the number of rows
-TriangularMatrix(sa_size_t rowSize)  : long_diag_(rowSize) 
-  {
-    elem_.ReSize((rowSize*(rowSize+1)/2) ); 
-  }
+TriangularMatrix(sa_size_t rowSize)
+  : long_diag_(rowSize) 
+{
+  elem_.ReSize((rowSize*(rowSize+1)/2) ); 
+}
+
 //! Copy constructor (possibility of sharing datas)
-  TriangularMatrix(const TriangularMatrix<T>& a,  bool share=false)  : elem_(a.elem_, share),  long_diag_(a.long_diag_) {;}
+TriangularMatrix(const TriangularMatrix<T>& a,  bool share=false)  
+  : long_diag_(a.long_diag_) , elem_(a.elem_, share)  
+{
+}
 
 //! resize the matrix with a new number of rows
 inline void ReSizeRow(sa_size_t rowSize) 
-  {
-    long_diag_=(uint_4)rowSize;
-    elem_.ReSize(long_diag_*(long_diag_+1)/2);
-  }
+{
+  long_diag_=(uint_4)rowSize;
+  elem_.ReSize(long_diag_*(long_diag_+1)/2);
+}
 
 TriangularMatrix<T>& SetT(T a)

trunk/SophyaLib/TArray/utilarr.cc

@@ -142 +142 @@
 MuTyV & EnumeratedSequence::Value (sa_size_t k) const 
 {
-  if (k >= vecv_.size())  retv_ = 0;
+  if (k >= (sa_size_t)vecv_.size())  retv_ = 0;
   else retv_ = vecv_[k];
   return(retv_);
@@ -175 +175 @@
 {
   os << " EnumeratedSequence::Print() - Size()= " << Size() << endl;
-  for(int k=0; k<vecv_.size(); k++) {
+  for(size_t k=0; k<vecv_.size(); k++) {
     os << vecv_[k];
     if ((k > 0) && (k%10 == 0))  os << endl;
@@ -190 +190 @@
 sa_size_t EnumeratedSequence::Append(EnumeratedSequence const & seq)
 {
-  for(int k=0; k<seq.vecv_.size(); k++) 
+  for(size_t k=0; k<seq.vecv_.size(); k++) 
     vecv_.push_back(seq.vecv_[k]);
   return(seq.vecv_.size());
@@ -278 +278 @@
   nc = 0;
   sa_size_t n = 0;
-  char buff[256];
+  //char buff[256];
   string line;
   int nbad, nbadtot, nel;