Changeset 1158 for XIOS/dev/dev_olga/src/attribute_template.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.hpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/attribute_template.hpp

@@ -16 +16 @@
 {
       /// ////////////////////// Déclarations ////////////////////// ///
+  /*!
+    \class CAttributeTemplate
+    The class implements attribute of some basic types
+  */
       template <class T>
          class CAttributeTemplate : public CAttribute, public CType<T>
@@ -54 +58 @@
             bool hasInheritedValue(void) const;
 
+            bool isEqual_(const CAttributeTemplate& attr );
+            bool isEqual(const CAttribute& attr );
+
             /// Destructeur ///
             virtual ~CAttributeTemplate(void) { }
@@ -62 +69 @@
             /// Autre ///
             virtual StdString toString(void) const { return _toString();}
-            virtual void fromString(const StdString & str) { _fromString(str);}
+            virtual void fromString(const StdString & str) { if (str==resetInheritanceStr) { reset(); _canInherite=false ;}  else _fromString(str);}
 //            virtual CAttributeTemplate* clone() const {}
 //            virtual void toBinary  (StdOStream & os) const;