Ignore:
Timestamp:
05/16/17 17:54:30 (7 years ago)
Author:
yushan
Message:

branch merged with trunk r1130

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/branch_yushan_merged/src/object_factory.hpp

    r769 r1134  
    5959 
    6060         /// Propriétés statiques /// 
    61          static StdString CurrContext; 
     61         static StdString *CurrContext_ptr; 
     62         #pragma omp threadprivate(CurrContext_ptr) 
    6263 
    6364   }; // class CObjectFactory 
Note: See TracChangeset for help on using the changeset viewer.