Changeset 1328 for XIOS/dev/branch_openmp/src/object_template_impl.hpp

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/object_template_impl.hpp (modified) (6 diffs)

XIOS/dev/branch_openmp/src/object_template_impl.hpp

@@ -24 +24 @@
       xios_map<StdString,
       xios_map<StdString,
-      boost::shared_ptr<T> > > *CObjectTemplate<T>::AllMapObj = 0;
+      //boost::shared_ptr<T> > > CObjectTemplate<T>::AllMapObj;
+      boost::shared_ptr<T> > > *CObjectTemplate<T>::AllMapObj_ptr = 0;
 
    template <class T>
       xios_map<StdString,
-      std::vector<boost::shared_ptr<T> > > *CObjectTemplate<T>::AllVectObj = 0;
-
-   template <class T>
-      xios_map<StdString,long int> *CObjectTemplate<T>::GenId = 0;
+      //std::vector<boost::shared_ptr<T> > > CObjectTemplate<T>::AllVectObj;
+      std::vector<boost::shared_ptr<T> > > *CObjectTemplate<T>::AllVectObj_ptr = 0;
+
+   template <class T>
+      //xios_map<StdString,long int> CObjectTemplate<T>::GenId;
+      xios_map<StdString,long int> *CObjectTemplate<T>::GenId_ptr = 0;
 
    template <class T>
@@ -66 +69 @@
          CObjectTemplate<T>::GetAllVectobject(const StdString & contextId)
    {
-      return (CObjectTemplate<T>::AllVectObj->at(contextId));
+      //return (CObjectTemplate<T>::AllVectObj[contextId]);
+    return (CObjectTemplate<T>::AllVectObj_ptr->at(contextId));
    }
 
@@ -321 +325 @@
 
    template <typename T>
-   boost::shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
+   shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
    {
      return CObjectFactory::GetObject<T>(ptr);
@@ -327 +331 @@
 
    template <typename T>
-   boost::shared_ptr<T> CObjectTemplate<T>::getShared(void)
+   shared_ptr<T> CObjectTemplate<T>::getShared(void)
    {
      return CObjectFactory::GetObject<T>((T*)this);
@@ -335 +339 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
-     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
+     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
      vector<T*> vect;
 
-     typename vector<boost::shared_ptr<T> >::const_iterator it;
+     typename vector<shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;
@@ -346 +350 @@
    const vector<T*> CObjectTemplate<T>::getAll(const string & id)
    {
-     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
+     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
      vector<T*> vect;
 
-     typename vector<boost::shared_ptr<T> >::const_iterator it;
+     typename vector<shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;