Changeset 13763

Timestamp:

10/19/12 17:35:57 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some cleanup from cppcheck

Location:

issm/trunk-jpl/src/c/Container

Files:

• DataSet.cpp (modified) (3 diffs)
• Elements.cpp (modified) (1 diff)
• Observations.cpp (modified) (1 diff)
• Options.h (modified) (5 diffs)

issm/trunk-jpl/src/c/Container/DataSet.cpp

@@ -190 +190 @@
         int id_offset;
         int offset;
-        int i;
 
         _assert_(this);
@@ -215 +214 @@
         /*vector of objects is already sorted, just allocate the sorted ids and their
          * offsets:*/
-        int i;
-
         if(objects.size()){
 
@@ -228 +225 @@
 
                 /*Build id_offsets and sorted_ids*/
-                for(i=0;i<objects.size();i++){
+                for(int i=0;i<objects.size();i++){
                         id_offsets[i]=i;
                         sorted_ids[i]=objects[i]->Id();

issm/trunk-jpl/src/c/Container/Elements.cpp

@@ -166 +166 @@
 void Elements::ToResults(Results* results,Parameters* parameters){
 
-        int i;
-
         int my_rank;
         int num_procs;

issm/trunk-jpl/src/c/Container/Observations.cpp

@@ -40 +40 @@
 
         /*Intermediaries*/
-        int          i,j,maxdepth,level,counter,index;
+        int          i,maxdepth,level,counter,index;
         int          xi,yi;
         IssmPDouble  xmin,xmax,ymin,ymax;

issm/trunk-jpl/src/c/Container/Options.h

@@ -25 +25 @@
                 template <class OptionType> void Get(OptionType* pvalue,const char* name){ /*{{{*/
 
-                        vector<Object*>::iterator object;
                         GenericOption<OptionType>* genericoption=NULL;
 
@@ -43 +42 @@
                 template <class OptionType> void Get(OptionType* pvalue,int* pnumel, const char* name){ /*{{{*/
 
-                        vector<Object*>::iterator object;
                         GenericOption<OptionType>* genericoption=NULL;
 
@@ -62 +60 @@
                 template <class OptionType> void Get(OptionType* pvalue,const char* name,OptionType default_value){ /*{{{*/
 
-                        vector<Object*>::iterator object;
                         GenericOption<OptionType>* genericoption=NULL;
 
@@ -79 +76 @@
                 template <class OptionType> void Get(OptionType* pvalue,int* pnumel, const char* name,OptionType default_value){ /*{{{*/
 
-                        vector<Object*>::iterator object;
                         GenericOption<OptionType>* genericoption=NULL;
 
@@ -102 +98 @@
 template <> inline void Options::Get(char** pvalue,const char* name,char* default_value){ /*{{{*/
 
-        vector<Object*>::iterator object;
         GenericOption<char*>* genericoption=NULL;