Changeset 561

Timestamp:

02/18/15 10:13:41 (10 years ago)

Author:

rlacroix

Message:

CCalendar: Make getCurrentDate and update methods return a const reference.

The current date should only be modified by the update method.

Location:

XIOS/trunk/src

Files:

• calendar.cpp (modified) (2 diffs)
• calendar.hpp (modified) (2 diffs)
• node/file.cpp (modified) (4 diffs)

XIOS/trunk/src/calendar.cpp

@@ -115 +115 @@
       }
 
-      CDate& CCalendar::update(int step)
+      const CDate& CCalendar::update(int step)
       {
         info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
-        return (this->getCurrentDate() = this->getInitDate() + step * this->timestep);
+        return (this->currentDate = this->getInitDate() + step * this->timestep);
       }
 
@@ -144 +144 @@
       const CDate& CCalendar::getInitDate(void) const     { return this->initDate; }
       const CDate& CCalendar::getTimeOrigin(void) const   { return this->timeOrigin; }
-      CDate& CCalendar::getCurrentDate(void)              { return this->currentDate; }
+      const CDate& CCalendar::getCurrentDate(void) const  { return this->currentDate; }
 
       //-----------------------------------------------------------------

XIOS/trunk/src/calendar.hpp

@@ -57 +57 @@
 
             /// Traitemants ///
-            CDate& update(int step);
+            const CDate& update(int step);
 
             /// Accesseurs ///
@@ -63 +63 @@
             const CDate& getInitDate(void) const;
             const CDate& getTimeOrigin(void) const;
-            CDate& getCurrentDate(void);
+            const CDate& getCurrentDate(void) const;
 
          public :

XIOS/trunk/src/node/file.cpp

@@ -188 +188 @@
    {
      CContext* context = CContext::getCurrent() ;
-     CDate& currentDate=context->calendar->getCurrentDate() ;
+     const CDate& currentDate = context->calendar->getCurrentDate() ;
      if (!sync_freq.isEmpty())
      {
@@ -204 +204 @@
    {
       CContext* context = CContext::getCurrent() ;
-      CDate& currentDate=context->calendar->getCurrentDate() ;
+      const CDate& currentDate = context->calendar->getCurrentDate() ;
       CContextServer* server=context->server ;
 
@@ -249 +249 @@
    {
      CContext* context = CContext::getCurrent() ;
-     CDate& currentDate=context->calendar->getCurrentDate() ;
+     const CDate& currentDate = context->calendar->getCurrentDate() ;
      if (!sync_freq.isEmpty())
      {
@@ -271 +271 @@
     {
       CContext* context = CContext::getCurrent() ;
-      CDate& currentDate=context->calendar->getCurrentDate() ;
+      const CDate& currentDate = context->calendar->getCurrentDate() ;
       if (!split_freq.isEmpty())
       {