Changeset 1158 for XIOS/dev/dev_olga/src/attribute_template_impl.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/attribute_template_impl.hpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/attribute_template_impl.hpp

@@ -71 +71 @@
          T CAttributeTemplate<T>::getValue(void) const
       {
-         return CType<T>::get() ;
-/*
-         if (SuperClass::isEmpty())
-         {
-            ERROR("T CAttributeTemplate<T>::getValue(void) const",
-                  << "[ id = " << this->getId() << "]"
-                  << " L'attribut est requis mais n'est pas défini !");
-          }
-         return (SuperClass::getValue<T>());
+        return CType<T>::get() ;
+/*
+        if (SuperClass::isEmpty())
+        {
+           ERROR("T CAttributeTemplate<T>::getValue(void) const",
+                 << "[ id = " << this->getId() << "]"
+                 << " L'attribut est requis mais n'est pas défini !");
+         }
+        return (SuperClass::getValue<T>());
 */
       }
@@ -125 +125 @@
     void CAttributeTemplate<T>::setInheritedValue(const CAttributeTemplate& attr)
     {
-      if (this->isEmpty() && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue()) ;
+      if (this->isEmpty() && _canInherite && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue()) ;
     }
 
@@ -139 +139 @@
     {
       return !this->isEmpty() || !inheritedValue.isEmpty() ;
+    }
+
+    template <class T>
+    bool CAttributeTemplate<T>::isEqual(const CAttribute& attr)
+    {
+      const CAttributeTemplate<T>& tmp = dynamic_cast<const CAttributeTemplate<T>& >(attr);
+      return this->isEqual_(tmp);
+    }
+
+    template <class T>
+    bool CAttributeTemplate<T>::isEqual_(const CAttributeTemplate& attr)
+    {
+      if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
+          return true;
+      if (this->hasInheritedValue() && attr.hasInheritedValue())
+          return (this->getInheritedValue() == attr.getInheritedValue());
+      else 
+        return false;
     }