Changeset 526 for XIOS/trunk/src/config/calendar_type.conf

Timestamp:

12/02/14 15:18:09 (10 years ago)

Author:

rlacroix

Message:

Convert some attributes to enumerations:

• file: par_access
• context: calendar_type

Those changes should have no effect on existing XML configuration files and ensure that a proper error message is always displayed during parsing if the value is not supported.

File:

• XIOS/trunk/src/config/calendar_type.conf (modified) (1 diff)

XIOS/trunk/src/config/calendar_type.conf

@@ -1 +1 @@
 #ifdef __XMLIO_CAllLeapCalendar__
-   DECLARE_CALENDAR(AllLeap  , AllLeap)
+   DECLARE_CALENDAR(AllLeap, calendar_type_attr::AllLeap)
 #endif //__XMLIO_CAllLeapCalendar__
 
 #ifdef __XMLIO_CD360Calendar__
-   DECLARE_CALENDAR(D360  , D360)
+   DECLARE_CALENDAR(D360, calendar_type_attr::D360)
 #endif //__XMLIO_CD360Calendar__
 
 #ifdef __XMLIO_CGregorianCalendar__
-   DECLARE_CALENDAR(Gregorian  , Gregorian)
+   DECLARE_CALENDAR(Gregorian, calendar_type_attr::Gregorian)
 #endif //__XMLIO_CGregorianCalendar__
 
 #ifdef __XMLIO_CJulianCalendar__
-   DECLARE_CALENDAR(Julian  , Julian)
+   DECLARE_CALENDAR(Julian, calendar_type_attr::Julian)
 #endif //__XMLIO_CJulianCalendar__
 
 #ifdef __XMLIO_CNoLeapCalendar__
-   DECLARE_CALENDAR(NoLeap  , NoLeap)
+   DECLARE_CALENDAR(NoLeap, calendar_type_attr::NoLeap)
 #endif //__XMLIO_CNoLeapCalendar__
-
-#undef DECLARE_CALENDAR