Changeset 1089
- Timestamp:
- 04/12/17 16:02:29 (7 years ago)
- Location:
- XIOS/dev/branch_yushan/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan/src/group_factory.cpp
r1088 r1089 9 9 void CGroupFactory::SetCurrentContextId(const StdString & context) 10 10 { 11 CGroupFactory::CurrContext = context;11 //CGroupFactory::CurrContext = context; 12 12 *CGroupFactory::CurrContext_ptr = context; 13 13 } -
XIOS/dev/branch_yushan/src/group_factory.hpp
r1088 r1089 69 69 70 70 /// Propriétés statiques /// 71 static StdString CurrContext;71 //static StdString CurrContext; 72 72 static StdString *CurrContext_ptr; 73 73 #pragma omp threadprivate(CurrContext_ptr) -
XIOS/dev/branch_yushan/src/node/axis.cpp
r1088 r1089 45 45 46 46 //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 47 std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>;47 std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; 48 48 bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr); 49 49 bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) … … 1005 1005 1006 1006 nodeElementName = node.getElementName(); 1007 std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it; 1007 if(transformationMapList_ptr == NULL) transformationMapList_ptr = new std::map<StdString, ETranformationType>; 1008 1009 std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it; 1008 1010 it = transformationMapList_ptr->find(nodeElementName); 1009 1011 if (ite != it) -
XIOS/dev/branch_yushan/src/object_factory.cpp
r1088 r1089 5 5 /// ////////////////////// Définitions ////////////////////// /// 6 6 7 StdString CObjectFactory::CurrContext("");7 //StdString CObjectFactory::CurrContext(""); 8 8 StdString *CObjectFactory::CurrContext_ptr = new StdString; 9 9 10 10 void CObjectFactory::SetCurrentContextId(const StdString & context) 11 11 { 12 CObjectFactory::CurrContext = context;12 //CObjectFactory::CurrContext = context; 13 13 *CObjectFactory::CurrContext_ptr = context; 14 14 } -
XIOS/dev/branch_yushan/src/object_factory.hpp
r1088 r1089 59 59 60 60 /// Propriétés statiques /// 61 static StdString CurrContext;61 //static StdString CurrContext; 62 62 static StdString *CurrContext_ptr; 63 63 #pragma omp threadprivate(CurrContext_ptr)
Note: See TracChangeset
for help on using the changeset viewer.