Changeset 2633

Timestamp:

05/29/24 19:26:04 (3 weeks ago)

Author:

ymipsl

Message:

Fix misfunction of "_reset_" for attributes when using field_ref.
YM

Location:

XIOS3/trunk/src

Files:

• attribute.hpp (modified) (1 diff)
• attribute_map.cpp (modified) (1 diff)

XIOS3/trunk/src/attribute.hpp

@@ -72 +72 @@
 
             bool canInherite(void) {return _canInherite ;}
+            bool setCannotInherit(void) {_canInherite=false ;}
+            bool setCanInherit(void) {_canInherite=true ;}
          protected : 
             bool _canInherite ;

XIOS3/trunk/src/attribute_map.cpp

@@ -240 +240 @@
                     this->setAttribute(el.first, el.second);
                  }
+                 else if (currentAtt->isEmpty() && currentAtt->canInherite() && el.second->isEmpty() && !el.second->canInherite())
+                 {
+                    currentAtt->setCannotInherit() ; // propagate non-inheritance
+                 }
                }
                else currentAtt->setInheritedValue(*parentAtt);