Changeset 1095 for XIOS/dev/branch_yushan/src/node/axis.cpp

Timestamp:

04/13/17 14:34:48 (7 years ago)

Author:

yushan

Message:

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

File:

• XIOS/dev/branch_yushan/src/node/axis.cpp (modified) (2 diffs)

XIOS/dev/branch_yushan/src/node/axis.cpp

@@ -44 +44 @@
    { /* Ne rien faire de plus */ }
 
-   //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>();
-   std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0;
-   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr);
+   std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>();
+   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_);
    bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
    {
@@ -1005 +1004 @@
 
         nodeElementName = node.getElementName();
-        if(transformationMapList_ptr == NULL) transformationMapList_ptr = new std::map<StdString, ETranformationType>;
-
-        std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it;
-        it = transformationMapList_ptr->find(nodeElementName);
+        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
+        it = transformationMapList_.find(nodeElementName);
         if (ite != it)
         {