Changeset 581 for XIOS/branchs/xios-1.0/src/interface/c_attr/icfilegroup_attr.cpp

Timestamp:

03/24/15 11:21:45 (9 years ago)

Author:

rlacroix

Message:

Fix the Fortran interface generation to avoid generating dead code that caused a timer not to be stopped.

File:

• XIOS/branchs/xios-1.0/src/interface/c_attr/icfilegroup_attr.cpp (modified) (13 diffs)

XIOS/branchs/xios-1.0/src/interface/c_attr/icfilegroup_attr.cpp

@@ -37 +37 @@
   bool cxios_is_defined_filegroup_description(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->description.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->description.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -59 +60 @@
   bool cxios_is_defined_filegroup_enabled(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->enabled.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->enabled.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -86 +88 @@
   bool cxios_is_defined_filegroup_group_ref(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->group_ref.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->group_ref.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -108 +111 @@
   bool cxios_is_defined_filegroup_min_digits(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->min_digits.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->min_digits.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -135 +139 @@
   bool cxios_is_defined_filegroup_name(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->name.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->name.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -162 +167 @@
   bool cxios_is_defined_filegroup_name_suffix(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->name_suffix.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->name_suffix.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -189 +195 @@
   bool cxios_is_defined_filegroup_output_freq(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->output_freq.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->output_freq.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -211 +218 @@
   bool cxios_is_defined_filegroup_output_level(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->output_level.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->output_level.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -238 +246 @@
   bool cxios_is_defined_filegroup_par_access(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->par_access.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->par_access.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -265 +274 @@
   bool cxios_is_defined_filegroup_split_freq(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->split_freq.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->split_freq.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -292 +302 @@
   bool cxios_is_defined_filegroup_split_freq_format(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->split_freq_format.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->split_freq_format.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -319 +330 @@
   bool cxios_is_defined_filegroup_sync_freq(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->sync_freq.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->sync_freq.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }
   
@@ -346 +358 @@
   bool cxios_is_defined_filegroup_type(filegroup_Ptr filegroup_hdl )
   {
-     CTimer::get("XIOS").resume();
-    return filegroup_hdl->type.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    bool isDefined = filegroup_hdl->type.hasInheritedValue();
+    CTimer::get("XIOS").suspend();
+    return isDefined;
   }