Changeset 343 for XIOS/trunk/src/node/file.cpp

Timestamp:

03/30/12 17:06:38 (12 years ago)

Author:

ymipsl

Message:

remove "date" namespace

ym

File:

• XIOS/trunk/src/node/file.cpp (modified) (6 diffs)

XIOS/trunk/src/node/file.cpp

@@ -130 +130 @@
    {
      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-     date::CDate& currentDate=context->calendar->getCurrentDate() ;
+     CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
      {
@@ -145 +145 @@
    {
       shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-      date::CDate& currentDate=context->calendar->getCurrentDate() ;
-      
-      if (! sync_freq.isEmpty()) syncFreq = date::CDuration::FromString(sync_freq.getValue());
-      if (! split_freq.isEmpty()) splitFreq = date::CDuration::FromString(split_freq.getValue());
-      if (! output_freq.isEmpty()) outputFreq = date::CDuration::FromString(output_freq.getValue());
-      lastSync=new date::CDate(currentDate) ;
-      lastSplit=new date::CDate(currentDate) ;
+      CDate& currentDate=context->calendar->getCurrentDate() ;
+      
+      if (! sync_freq.isEmpty()) syncFreq = CDuration::FromString(sync_freq.getValue());
+      if (! split_freq.isEmpty()) splitFreq = CDuration::FromString(split_freq.getValue());
+      if (! output_freq.isEmpty()) outputFreq = CDuration::FromString(output_freq.getValue());
+      lastSync=new CDate(currentDate) ;
+      lastSplit=new CDate(currentDate) ;
       isOpen=false ;
     }
@@ -166 +166 @@
    {
      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-     date::CDate& currentDate=context->calendar->getCurrentDate() ;
+     CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
      {
@@ -183 +183 @@
     {
       shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-      date::CDate& currentDate=context->calendar->getCurrentDate() ;
+      CDate& currentDate=context->calendar->getCurrentDate() ;
       if (! split_freq.isEmpty())
       {
@@ -202 +202 @@
    {
       shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-      date::CDate& currentDate=context->calendar->getCurrentDate() ;
+      CDate& currentDate=context->calendar->getCurrentDate() ;
       
       std::vector<boost::shared_ptr<CField> >::iterator it, end = this->enabledFields.end();
@@ -224 +224 @@
          if (!name_suffix.isEmpty()) oss << name_suffix.getValue();
 //         if (!split_freq.isEmpty()) oss<<"-["<<currentDate.toString()<<"]" ;
-         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStryyyymmdd()<<"-"<< (*lastSplit+(splitFreq-1*date::Second)).getStryyyymmdd();
+         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStryyyymmdd()<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStryyyymmdd();
          bool multifile=true ;
          if (!type.isEmpty())