Changeset 1545 for XIOS/dev/branch_openmp/src/interface/c/icdate.cpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

• XIOS/dev/branch_openmp/src/interface/c/icdate.cpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/interface/c/icdate.cpp

@@ -4 +4 @@
 
 #include <boost/multi_array.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "xios.hpp"
@@ -27 +26 @@
   if (!context)
     ERROR(idFunc, << "Impossible to do calendar operations: no current context available.");
-  const boost::shared_ptr<xios::CCalendar> cal = context->getCalendar();
+  const std::shared_ptr<xios::CCalendar> cal = context->getCalendar();
   if (!cal)
     ERROR(idFunc, << "Impossible to do calendar operations: no calendar was defined.");
@@ -82 +81 @@
                                    date_c.hour, date_c.minute, date_c.second);
     xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep );
+
     xios::CDate res = date - dur;
     return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() };