Changeset 527 for XIOS/trunk/src/interface

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.

Location:

XIOS/trunk/src/interface/c_attr

Files:

• icvariable_attr.cpp (modified) (2 diffs)
• icvariablegroup_attr.cpp (modified) (2 diffs)

XIOS/trunk/src/interface/c_attr/icvariable_attr.cpp

@@ -48 +48 @@
     if(!cstr2string(type, type_size, type_str)) return;
      CTimer::get("XIOS").resume();
-    variable_hdl->type.setValue(type_str);
+    variable_hdl->type.fromString(type_str);
      CTimer::get("XIOS").suspend();
   }
@@ -55 +55 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(variable_hdl->type.getInheritedValue(),type , type_size))
+    if(!string_copy(variable_hdl->type.getInheritedStringValue(),type , type_size))
       ERROR("void cxios_get_variable_type(variable_Ptr variable_hdl, char * type, int type_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/interface/c_attr/icvariablegroup_attr.cpp

@@ -74 +74 @@
     if(!cstr2string(type, type_size, type_str)) return;
      CTimer::get("XIOS").resume();
-    variablegroup_hdl->type.setValue(type_str);
+    variablegroup_hdl->type.fromString(type_str);
      CTimer::get("XIOS").suspend();
   }
@@ -81 +81 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(variablegroup_hdl->type.getInheritedValue(),type , type_size))
+    if(!string_copy(variablegroup_hdl->type.getInheritedStringValue(),type , type_size))
       ERROR("void cxios_get_variablegroup_type(variablegroup_Ptr variablegroup_hdl, char * type, int type_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();