Changeset 1460 for XIOS/dev/branch_openmp/src/attribute_enum_impl.hpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/src/attribute_enum_impl.hpp (modified) (1 diff)

XIOS/dev/branch_openmp/src/attribute_enum_impl.hpp

@@ -114 +114 @@
   bool CAttributeEnum<T>::isEqual(const CAttribute& attr)
   {
-    return (this->isEqual(dynamic_cast<const CAttributeEnum<T>& >(attr)));
-  }
-
-  template <class T>
-  bool CAttributeEnum<T>::isEqual(const CAttributeEnum& attr)
-  {
-    return ((dynamic_cast<const CEnum<T>& >(*this)) == (dynamic_cast<const CEnum<T>& >(attr)));
+    const CAttributeEnum<T>& tmp = dynamic_cast<const CAttributeEnum<T>& >(attr);
+    return this->isEqual_(tmp);
+  }
+
+  template <class T>
+  bool CAttributeEnum<T>::isEqual_(const CAttributeEnum& attr)
+  {
+    if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
+        return true;
+    if (this->hasInheritedValue() && attr.hasInheritedValue())
+        return (this->getInheritedValue() == attr.getInheritedValue());
+    else 
+      return false;    
   }