Changeset 527 for XIOS/trunk/src/declare_attribute.hpp

Timestamp:

12/03/14 11:41:54 (9 years ago)

Author:

rlacroix

Message:

Make the variable typing stricter.

The type must now be one of:

• bool
• int or int32
• int16
• int64
• float
• double
• string

WARNING: The variable type was previously not checked and using an unsupported type did not lead to any error message. Be aware that this change can make your existing configuration files invalid. However the adjustments required to adapt existing files should be minor.

File:

• XIOS/trunk/src/declare_attribute.hpp (modified) (1 diff)

XIOS/trunk/src/declare_attribute.hpp

@@ -115 +115 @@
    DECLARE_CLASS_ENUM(name) 
 
+  #define DECLARE_TYPE(name)                                      \
+   class Enum_##name                                              \
+   {                                                              \
+     public:                                                      \
+     enum t_enum { t_bool=0, t_int16, t_int, t_int32, t_int64, t_float, t_double, t_string }; \
+     const char** getStr(void) const { static const char * enumStr[] = { "bool", "int16", "int", "int32", "int64", "float", "double", "string" }; return enumStr; } \
+     int getSize(void) const { return 8; }                        \
+   };                                                             \
+   DECLARE_CLASS_ENUM(name)
 
 #define BEGIN_DECLARE_ATTRIBUTE_MAP(type)                  \