Ignore:
Timestamp:
11/19/18 15:52:54 (6 years ago)
Author:
yushan
Message:

branch_openmp merged with trunk r1597

Location:
XIOS/dev/dev_trunk_omp/src/type
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/src/type/type.hpp

    r1478 r1601  
    9595    const CType_ref& operator = (CType<T>& val) const ; 
    9696    const CType_ref& operator = (const CType_ref& val) const; 
    97     operator T&() const;     
     97    operator T&() const; 
    9898 
    9999    inline virtual CBaseType* clone(void) const   { return _clone(); } 
  • XIOS/dev/dev_trunk_omp/src/type/type_impl.hpp

    r1478 r1601  
    8888  { 
    8989    this->checkEmpty(); 
    90    return *ptrValue ; 
     90    return *ptrValue ; 
    9191  } 
    9292 
     
    129129   CType<T>::operator const T&() const 
    130130   { 
    131     this->checkEmpty(); 
    132     return *ptrValue ; 
     131     this->checkEmpty(); 
     132     return *ptrValue ; 
    133133   } 
    134134 
Note: See TracChangeset for help on using the changeset viewer.