Changeset 1134 for XIOS/dev/branch_yushan_merged/src/attribute_enum_impl.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/attribute_enum_impl.hpp (modified) (5 diffs)

XIOS/dev/branch_yushan_merged/src/attribute_enum_impl.hpp

@@ -10 +10 @@
 namespace xios
 {
-  /// ////////////////////// Définitions ////////////////////// ///
+  /// ////////////////////// Définitions ////////////////////// ///
   template <class T>
   CAttributeEnum<T>::CAttributeEnum(const StdString & id)
@@ -30 +30 @@
      umap.insert(umap.end(), std::make_pair(id, this));
   }
-
+ 
   template <class T>
   CAttributeEnum<T>::CAttributeEnum
@@ -40 +40 @@
      umap.insert(umap.end(), std::make_pair(id, this));
   }
-
+ 
   ///--------------------------------------------------------------
   template <class T>
@@ -54 +54 @@
      return CEnum<T>::get();
   }
-
+ 
   template <class T>
   string CAttributeEnum<T>::getStringValue(void) const
   {
-     return CEnum<T>::toString();
-  }
+    return CEnum<T>::toString();
+  }
+
 
   template <class T>
@@ -70 +71 @@
   void CAttributeEnum<T>::set(const CAttribute& attr)
   {
-    this->set(dynamic_cast<const CAttributeEnum<T>& >(attr));
-  }
-
- template <class T>
+     this->set(dynamic_cast<const CAttributeEnum<T>& >(attr));
+  }
+   
+  template <class T>
   void CAttributeEnum<T>::set(const CAttributeEnum& attr)
   {
-    CEnum<T>::set(attr);
-  }
-
+     CEnum<T>::set(attr);
+  }
+ 
   template <class T>
   void CAttributeEnum<T>::setInheritedValue(const CAttribute& attr)
   {
-    this->setInheritedValue(dynamic_cast<const CAttributeEnum<T>& >(attr));
-  }
-
+     this->setInheritedValue(dynamic_cast<const CAttributeEnum<T>& >(attr));
+  }
+  
   template <class T>
   void CAttributeEnum<T>::setInheritedValue(const CAttributeEnum& attr)
   {
-    if (this->isEmpty() && _canInherite && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue());
-  }
-
+     if (this->isEmpty() && _canInherite && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue());
+  }
+  
   template <class T>
   typename T::t_enum CAttributeEnum<T>::getInheritedValue(void) const
   {
-    if (this->isEmpty()) return inheritedValue.get();
-    else return getValue();
-  }
-
-  template <class T>
-  string CAttributeEnum<T>::getInheritedStringValue(void) const
-  {
-     if (this->isEmpty()) return inheritedValue.toString();
-     else return CEnum<T>::toString();;
-  }
-
-  template <class T>
-  bool CAttributeEnum<T>::hasInheritedValue(void) const
-  {
-    return !this->isEmpty() || !inheritedValue.isEmpty();
-  }
-
-  template <class T>
-  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)));
-  }
+     if (this->isEmpty()) return inheritedValue.get();
+     else return getValue();
+  }
+
+  template <class T>
+      string CAttributeEnum<T>::getInheritedStringValue(void) const
+      {
+          if (this->isEmpty()) return inheritedValue.toString();
+          else return CEnum<T>::toString();;
+      }
+
+  template <class T>
+      bool CAttributeEnum<T>::hasInheritedValue(void) const
+      {
+          return !this->isEmpty() || !inheritedValue.isEmpty();
+      }
+
+  template <class T>
+      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)));
+      }
 
   //---------------------------------------------------------------
 
   template <class T>
-  CAttributeEnum<T>& CAttributeEnum<T>::operator=(const T_enum & value)
-  {
-     this->setValue(value);
-     return *this;
-  }
+      CAttributeEnum<T>& CAttributeEnum<T>::operator=(const T_enum & value)
+      {
+          this->setValue(value);
+          return *this;
+      }
 
   //---------------------------------------------------------------
 
   template <class T>
-  StdString CAttributeEnum<T>::_toString(void) const
-  {
-     StdOStringStream oss;
-     if (!CEnum<T>::isEmpty() && this->hasId())
-        oss << this->getName() << "=\"" << CEnum<T>::toString() << "\"";
-     return (oss.str());
-  }
-
-  template <class T>
-  void CAttributeEnum<T>::_fromString(const StdString & str)
-  {
-    CEnum<T>::fromString(str);
-  }
-
-  template <class T>
-  bool CAttributeEnum<T>::_toBuffer (CBufferOut& buffer) const
-  {
-     return CEnum<T>::toBuffer(buffer);
-  }
-
-  template <class T>
-  bool CAttributeEnum<T>::_fromBuffer(CBufferIn& buffer)
-  {
-    return CEnum<T>::fromBuffer(buffer);
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateCInterface(ostream& oss,const string& className)
-  {
-    CInterface::AttributeCInterface<CEnumBase>(oss, className, this->getName());
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortran2003Interface(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortran2003Interface<string>(oss, className, this->getName());
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceDeclaration_(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceDeclaration<string>(oss, className, this->getName()+"_");
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceBody_(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceBody<string>(oss, className, this->getName());
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceDeclaration(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceDeclaration<string>(oss, className, this->getName());
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceGetDeclaration<string>(oss, className, this->getName()+"_");
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceGetBody_(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceGetBody<string>(oss, className, this->getName());
-  }
-
-  template <typename T>
-  void CAttributeEnum<T>::generateFortranInterfaceGetDeclaration(ostream& oss,const string& className)
-  {
-    CInterface::AttributeFortranInterfaceGetDeclaration<string>(oss, className, this->getName());
-  }
+      StdString CAttributeEnum<T>::_toString(void) const
+      {
+          StdOStringStream oss;
+          if (!CEnum<T>::isEmpty() && this->hasId())
+              oss << this->getName() << "=\"" << CEnum<T>::toString() << "\"";
+          return (oss.str());
+      }
+
+  template <class T>
+      void CAttributeEnum<T>::_fromString(const StdString & str)
+      {
+          CEnum<T>::fromString(str);
+      }
+
+  template <class T>
+      bool CAttributeEnum<T>::_toBuffer (CBufferOut& buffer) const
+      {
+          return CEnum<T>::toBuffer(buffer);
+      }
+
+  template <class T>
+      bool CAttributeEnum<T>::_fromBuffer(CBufferIn& buffer)
+      {
+          return CEnum<T>::fromBuffer(buffer);
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateCInterface(ostream& oss,const string& className)
+      {
+          CInterface::AttributeCInterface<CEnumBase>(oss, className, this->getName());
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortran2003Interface(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortran2003Interface<string>(oss, className, this->getName());
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceDeclaration_(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceDeclaration<string>(oss, className, this->getName()+"_");
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceBody_(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceBody<string>(oss, className, this->getName());
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceDeclaration(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceDeclaration<string>(oss, className, this->getName());
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceGetDeclaration<string>(oss, className, this->getName()+"_");
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceGetBody_(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceGetBody<string>(oss, className, this->getName());
+      }
+
+  template <typename T>
+      void CAttributeEnum<T>::generateFortranInterfaceGetDeclaration(ostream& oss,const string& className)
+      {
+          CInterface::AttributeFortranInterfaceGetDeclaration<string>(oss, className, this->getName());
+      }
 } // namespace xios
 
 #endif // __XIOS_ATTRIBUTE_ENUM_IMPL_HPP__
+