Changeset 778 for XIOS/trunk/src/attribute_template_impl.hpp

Timestamp:

11/04/15 15:50:19 (9 years ago)

Author:

rlacroix

Message:

Fix the generation of the Fortran interface to support private attributes.

File:

• XIOS/trunk/src/attribute_template_impl.hpp (modified) (8 diffs)

XIOS/trunk/src/attribute_template_impl.hpp

@@ -245 +245 @@
       void CAttributeTemplate<T>::generateCInterface(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeCInterface<T>(oss, className, this->getName()) ;
-//        CInterface::AttributeIsDefinedCInterface(oss, className, this->getName()) ;
+        CInterface::AttributeCInterface<T>(oss, className, this->getName());
       }
 
@@ -253 +251 @@
       void CAttributeTemplate<T>::generateFortran2003Interface(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortran2003Interface<T>(oss, className, this->getName()) ;
-//        CInterface::AttributeIsDefinedFortran2003Interface(oss, className, this->getName()) ;
+        CInterface::AttributeFortran2003Interface<T>(oss, className, this->getName());
       }
 
@@ -261 +257 @@
       void CAttributeTemplate<T>::generateFortranInterfaceDeclaration_(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()+"_") ;
+        CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName() + "_");
       }
 
@@ -268 +263 @@
       void CAttributeTemplate<T>::generateFortranInterfaceBody_(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceBody<T>(oss, className, this->getName()) ;
+        CInterface::AttributeFortranInterfaceBody<T>(oss, className, this->getName());
       }
 
@@ -275 +269 @@
       void CAttributeTemplate<T>::generateFortranInterfaceDeclaration(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()) ;
+        CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName());
       }
 
@@ -282 +275 @@
       void CAttributeTemplate<T>::generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()+"_") ;
+        CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName() + "_");
       }
 
@@ -290 +282 @@
       void CAttributeTemplate<T>::generateFortranInterfaceGetBody_(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceGetBody<T>(oss, className, this->getName()) ;
+        CInterface::AttributeFortranInterfaceGetBody<T>(oss, className, this->getName());
       }
 
@@ -297 +288 @@
       void CAttributeTemplate<T>::generateFortranInterfaceGetDeclaration(ostream& oss,const string& className)
       {
-        if (this->isAttributePublic())
-          CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()) ;
+        CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName());
       }