Changeset 1460 for XIOS/dev/branch_openmp/src/attribute_enum.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.hpp (modified) (2 diffs)

XIOS/dev/branch_openmp/src/attribute_enum.hpp

@@ -49 +49 @@
             T_enum getInheritedValue(void)  const;
             string getInheritedStringValue(void) const;
-            bool hasInheritedValue(void) const;          
-          
-            bool isEqual(const CAttributeEnum& attr );
+            bool hasInheritedValue(void) const;                    
+            
             bool isEqual(const CAttribute& attr );
 
@@ -77 +76 @@
 
          private :
+          bool isEqual_(const CAttributeEnum& attr );
           StdString _toString(void) const;
           void _fromString(const StdString & str);