Changeset 369 for XIOS/trunk/src/attribute_template.hpp

Timestamp:

10/16/12 13:04:44 (12 years ago)

Author:

ymipsl

Message:

Major Update

• redesign Type and attribute manipulation
• add enumerate type and attribute
• use blitz class array instead of boost class array

YM

File:

• XIOS/trunk/src/attribute_template.hpp (modified) (5 diffs)

XIOS/trunk/src/attribute_template.hpp

@@ -8 +8 @@
 #include "xmlioserver_spl.hpp"
 #include "exception.hpp"
-#include "array.hpp"
 #include "attribute.hpp"
 #include "buffer_in.hpp"
 #include "buffer_out.hpp"
+#include "type.hpp"
 
 
@@ -18 +18 @@
       /// ////////////////////// Déclarations ////////////////////// ///
       template <class T>
-         class CAttributeTemplate : public CAttribute
+         class CAttributeTemplate : public CAttribute, public CType<T>
       {
             typedef CAttribute SuperClass;
@@ -34 +34 @@
             CAttributeTemplate(const StdString & id, const ValueType & value,
                                xios_map<StdString, CAttribute*> & umap);
-            CAttributeTemplate(const CAttribute & attribut) throw (CException);
-            CAttributeTemplate(const CAttribute * const attribut); // Not implemented.
+//            CAttributeTemplate(const CAttribute & attribut) throw (CException);
+//            CAttributeTemplate(const CAttribute * const attribut); // Not implemented.
 
           public :
@@ -41 +41 @@
             /// Accesseur ///
             ValueType getValue(void) const;
-            ValueType* getRef(void) ;
+//            ValueType* getRef(void) ;
 
             /// Mutateurs ///
             void setValue(const ValueType & value);
-
+            
+            void set(const CAttribute& attr) ;
+            void set(const CAttributeTemplate& attr) ;
+            
             /// Destructeur ///
-            virtual ~CAttributeTemplate(void);
+            virtual ~CAttributeTemplate(void) { }
 
             /// Operateur ///
-            ValueType operator=(const ValueType & value);
+            CAttributeTemplate& operator=(const ValueType & value);
 
             /// Autre ///
-            virtual StdString toString(void) const;
-            virtual void fromString(const StdString & str);
+            virtual StdString toString(void) const { return _toString();}
+            virtual void fromString(const StdString & str) { _fromString(str);}
+//            virtual CAttributeTemplate* clone() const {}
+//            virtual void toBinary  (StdOStream & os) const;
+//            virtual void fromBinary(StdIStream & is);            
 
-            virtual void toBinary  (StdOStream & os) const;
-            virtual void fromBinary(StdIStream & is);            
-
-            virtual bool toBuffer  (CBufferOut& buffer) const;
-            virtual bool fromBuffer(CBufferIn& buffer) ;
-            virtual size_t size(void) const;
+            virtual bool toBuffer  (CBufferOut& buffer) const { return _toBuffer(buffer);} 
+            virtual bool fromBuffer(CBufferIn& buffer) { return _fromBuffer(buffer); } 
+//            virtual size_t size(void) const;
             virtual void generateCInterface(ostream& oss,const string& className) ;
             virtual void generateFortran2003Interface(ostream& oss,const string& className) ;
@@ -75 +78 @@
 
             /// Constructeurs ///
-            CAttributeTemplate(void); // Not implemented.
-
+//            CAttributeTemplate(void); // Not implemented.
+         private :
+          StdString _toString(void) const;
+          void _fromString(const StdString & str);
+          bool _toBuffer  (CBufferOut& buffer) const;
+          bool _fromBuffer(CBufferIn& buffer) ;
       }; // class CAttribute