Ignore:
Timestamp:
04/13/17 14:34:48 (5 years ago)
Author:
yushan
Message:

modif for Curie, CurrContext?->CurrContext_ptr in object_factory and group_factory

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/src/node/axis.cpp

    r1089 r1095  
    4444   { /* Ne rien faire de plus */ } 
    4545 
    46    //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 
    47    std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; 
    48    bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr); 
     46   std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 
     47   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_); 
    4948   bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 
    5049   { 
     
    10051004 
    10061005        nodeElementName = node.getElementName(); 
    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; 
    1010         it = transformationMapList_ptr->find(nodeElementName); 
     1006        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 
     1007        it = transformationMapList_.find(nodeElementName); 
    10111008        if (ite != it) 
    10121009        { 
Note: See TracChangeset for help on using the changeset viewer.