Changeset 579 for XIOS/branchs/xios-1.0

Timestamp:

03/23/15 11:18:04 (9 years ago)

Author:

rlacroix

Message:

Add a missing return statement to the CDuration::solveTimeStep method.

Cosmetic only, the return value was never used.

File:

• XIOS/branchs/xios-1.0/src/duration.cpp (modified) (10 diffs)

XIOS/branchs/xios-1.0/src/duration.cpp

@@ -20 +20 @@
       CDuration & CDuration::operator=(const CDuration & duration)
       {
-         year = duration.year;  month  = duration.month ; day    = duration.day;
-         hour = duration.hour;  minute = duration.minute; second = duration.second; timestep=duration.timestep ;
-         return (*this);
+         year = duration.year;  month  = duration.month;  day    = duration.day;
+         hour = duration.hour;  minute = duration.minute; second = duration.second; timestep=duration.timestep;
+         return *this;
       }
 
@@ -29 +29 @@
          StdOStringStream sout;
          bool testValue = true;
-         if(duration.year   != 0.0) { testValue = false; sout << duration.year   << "y " ; }
+         if(duration.year   != 0.0) { testValue = false; sout << duration.year   << "y "; }
          if(duration.month  != 0.0) { testValue = false; sout << duration.month  << "mo "; }
-         if(duration.day    != 0.0) { testValue = false; sout << duration.day    << "d " ; }
-         if(duration.hour   != 0.0) { testValue = false; sout << duration.hour   << "h " ; }
+         if(duration.day    != 0.0) { testValue = false; sout << duration.day    << "d "; }
+         if(duration.hour   != 0.0) { testValue = false; sout << duration.hour   << "h "; }
          if(duration.minute != 0.0) { testValue = false; sout << duration.minute << "mi "; }
-         if(duration.second != 0.0) { testValue = false; sout << duration.second << "s " ; }
-         if(duration.timestep != 0.0 || testValue)       { sout << duration.timestep << "ts " ; }
+         if(duration.second != 0.0) { testValue = false; sout << duration.second << "s "; }
+         if(duration.timestep != 0.0 || testValue)       { sout << duration.timestep << "ts "; }
 
          // << suppression de l'espace en fin de chaîne.
          out << (sout.str().substr(0, sout.str().size()-1));
-         return (out);
+         return out;
       }
 
@@ -50 +50 @@
          while (!in.eof())
          {
-               if (!(in >> v >> c)) 
+               if (!(in >> v >> c))
                {
-                 //DEBUG("----> Pb StdIStream & operator>>(StdIStream & in , CDuration & duration)") ;
-                 //if (in.eof())  DEBUG("----> Fin de fichier StdIStream & operator>>(StdIStream & in , CDuration & duration)") ;
+                 //DEBUG("----> Pb StdIStream & operator>>(StdIStream & in , CDuration & duration)");
+                 //if (in.eof())  DEBUG("----> Fin de fichier StdIStream & operator>>(StdIStream & in , CDuration & duration)");
                }
-               if (in.eof())  
+               if (in.eof())
                {
-                 //DEBUG("----> Fin de fichier StdIStream & operator>>(StdIStream & in , CDuration & duration)") ;
-                 break ;
+                 //DEBUG("----> Fin de fichier StdIStream & operator>>(StdIStream & in , CDuration & duration)");
+                 break;
                }
                switch (c)
@@ -82 +82 @@
                   {
                     in >> c;
-                    if (c=='s') duration.timestep = v; 
+                    if (c=='s') duration.timestep = v;
                     break;
                   }
-                  
+
                   default:
                      StdString valc; valc.append(1, c);
@@ -92 +92 @@
                }
             }
-            return (in);
+            return in;
       }
 
@@ -101 +101 @@
          if ((year == 0) && (month  == 0) && (day    == 0) &&
              (hour == 0) && (minute == 0) && (second == 0) && (timestep == 0))
-            return (true);
-         return (false);
+            return true;
+         return false;
       }
 
@@ -108 +108 @@
       CDuration & CDuration::solveTimeStep(const CCalendar & c)
       {
-        CDuration timeStep=c.getTimeStep() ;
-        second +=timestep*timeStep.second ; 
-        minute +=timestep*timeStep.minute ; 
-        hour +=timestep*timeStep.hour ; 
-        day +=timestep*timeStep.day ; 
-        month +=timestep*timeStep.month ; 
-        year +=timestep*timeStep.year ; 
-        timestep = 0 ;
+        CDuration timeStep=c.getTimeStep();
+        second +=timestep*timeStep.second;
+        minute +=timestep*timeStep.minute;
+        hour +=timestep*timeStep.hour;
+        day +=timestep*timeStep.day;
+        month +=timestep*timeStep.month;
+        year +=timestep*timeStep.year;
+        timestep = 0;
+        return *this;
+      }
 
-      }
-               
-        
       CDuration & CDuration::resolve(const CCalendar & c)
       {
@@ -139 +138 @@
          month  += modf(year, &year) * (float)c.getYearLength();
          year   += int(month) /c.getYearLength(); month  = int(month)%c.getYearLength();
-         return (*this);
+         return *this;
       }
 
@@ -148 +147 @@
          const  CDuration & own = *this;
          StdOStringStream oss; oss << own;
-         return (oss.str());
+         return oss.str();
       }
 
@@ -155 +154 @@
          CDuration dr = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
          StdIStringStream iss(str); iss >> dr;
-         return (dr);
+         return dr;
       }
 
       ///---------------------------------------------------------------
-
-
 } // namespace xios