Changeset 1601 for XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp

@@ -24 +24 @@
       xios_map<StdString,
       xios_map<StdString,
-      std::shared_ptr<T> > > CObjectTemplate<T>::AllMapObj;
+      std::shared_ptr<T> > > *CObjectTemplate<T>::AllMapObj_ptr = 0;
 
    template <class T>
       xios_map<StdString,
-      std::vector<std::shared_ptr<T> > > CObjectTemplate<T>::AllVectObj;
-
-   template <class T>
-      xios_map<StdString,long int> CObjectTemplate<T>::GenId;
+      std::vector<std::shared_ptr<T> > > *CObjectTemplate<T>::AllVectObj_ptr = 0;
+
+   template <class T>
+      xios_map<StdString,long int> *CObjectTemplate<T>::GenId_ptr = 0;
 
    template <class T>
@@ -66 +66 @@
          CObjectTemplate<T>::GetAllVectobject(const StdString & contextId)
    {
-      return (CObjectTemplate<T>::AllVectObj[contextId]);
+     return (CObjectTemplate<T>::AllVectObj_ptr->at(contextId));
    }
 
@@ -426 +426 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
-     const vector< std::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
+     const vector< std::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(CObjectFactory::GetCurrentContextId());
      vector<T*> vect;