Changeset 527 for XIOS/trunk/src/node/variable.hpp

Timestamp:

12/03/14 11:41:54 (10 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/node/variable.hpp (modified) (4 diffs)

XIOS/trunk/src/node/variable.hpp

@@ -7 +7 @@
 #include "group_template.hpp"
 #include "array_new.hpp"
+#include "attribute_enum.hpp"
+#include "attribute_enum_impl.hpp"
 
 namespace xios
@@ -55 +57 @@
 
          public :
-            enum EVarType
-            {  t_int, t_short_int, t_long_int, t_float, t_double, t_long_double, t_bool, t_string, t_undefined } ;
-
-
             /// Autres ///
             virtual void parse(xml::CXMLNode & node);
@@ -74 +72 @@
             template <typename T, StdSize N>
             inline void getData(CArray<T, N>& _data_array) const;
-
-            EVarType getVarType(void) const ;
 
             static bool dispatchEvent(CEventServer& event) ;
@@ -139 +135 @@
       // Declare/Define CVarGroup and CVarDefinition
       DECLARE_GROUP_PARSE_REDEF(CVariable);
-
-
-
 } // namespace xios