Changeset 394 for XIOS/trunk

Timestamp:

12/10/12 23:48:21 (11 years ago)

Author:

ymipsl

Message:

PGI port on CURIE

YM

Location:

XIOS/trunk/src

Files:

• array_new.hpp (modified) (1 diff)
• type/enum.hpp (modified) (2 diffs)
• type/type.hpp (modified) (2 diffs)

XIOS/trunk/src/array_new.hpp

@@ -162 +162 @@
     virtual size_t size(void) const { return (this->dimensions()+1)*sizeof(int)+sizeof(size_t) + this->numElements()*sizeof(T_numtype) ;}
  
-    virtual CArray* clone(void) const { return new CArray(*this); }
+    virtual CBaseType* clone(void) const { return new CArray(*this); }
        
     virtual bool toBuffer(CBufferOut& buffer) const

XIOS/trunk/src/type/enum.hpp

@@ -42 +42 @@
     __INLINE__ operator T_enum&() ;
         
-    virtual CEnum* clone(void) const   { return _clone(); }
+    inline virtual CBaseType* clone(void) const   { return _clone(); }
     virtual void fromString(const string& str)   { _fromString(str); }
     virtual string toString(void) const { return _toString(); }
@@ -102 +102 @@
     bool operator == (const CEnum_ref &other) {return this->get()==other.get() ;}
 
-    virtual CEnum_ref* clone(void) const   { return _clone(); }
+    inline virtual CBaseType* clone(void) const   { return _clone(); }
     virtual void fromString(const string& str)   { _fromString(str); }
     virtual void fromString(const string& str) const  { _fromString(str); }

XIOS/trunk/src/type/type.hpp

@@ -36 +36 @@
     operator T&() ;
     
-    virtual CType* clone(void) const   { return _clone(); }
+    inline virtual CBaseType* clone(void) const   { return _clone(); }
     virtual void fromString(const string& str)   { _fromString(str); }
     virtual string toString(void) const { return _toString(); }
@@ -95 +95 @@
     operator T&() const;
 
-    virtual CType_ref* clone(void) const   { return _clone(); }
+    inline virtual CBaseType* clone(void) const   { return _clone(); }
     virtual void fromString(const string& str)   { _fromString(str); }
     virtual void fromString(const string& str) const  { _fromString(str); }