Changeset 1542 for XIOS/trunk/src/node/calendar_wrapper.cpp

Timestamp:

06/13/18 16:48:53 (6 years ago)

Author:

oabramkina

Message:

Replacing Boost's unordered_map and shared_pointer by its STL counterparts.

Two notes for Curie:

• one can see the content of unordered_map with ddt only if XIOS has been compiled with gnu
• XIOS will not compile any more with pgi (all available versions use old STL which are not up to the c++11 norms)

File:

• XIOS/trunk/src/node/calendar_wrapper.cpp (modified) (3 diffs)

XIOS/trunk/src/node/calendar_wrapper.cpp

@@ -32 +32 @@
   \return the calendar
   */
-  boost::shared_ptr<CCalendar> CCalendarWrapper::getCalendar(bool checkValid /*= false*/) const
+  std::shared_ptr<CCalendar> CCalendarWrapper::getCalendar(bool checkValid /*= false*/) const
   {
     if (checkValid && !this->calendar)
@@ -92 +92 @@
 #define DECLARE_CALENDAR(MType, eType)                                     \
       if (type.getValue() == type_attr::eType)                             \
-        calendar = boost::shared_ptr<CCalendar>(new C##MType##Calendar());
+        calendar = std::shared_ptr<CCalendar>(new C##MType##Calendar());
 #include "calendar_type.conf"
 #undef DECLARE_CALENDAR
@@ -111 +111 @@
                 << "Both leap_year_drift and leap_year_month attributes are mandatory if you wish to use leap_year_drift_offset attribute.");
 
-        boost::shared_ptr<CUserDefinedCalendar> userDefinedCalendar;
+        std::shared_ptr<CUserDefinedCalendar> userDefinedCalendar;
         if (year_length.isEmpty())
           userDefinedCalendar.reset(new CUserDefinedCalendar(day_length.getValue(), month_lengths.getValue()));