Changeset 1087 for XIOS/dev/branch_yushan/src/object_template.hpp

Timestamp:

04/12/17 11:55:38 (7 years ago)

Author:

yushan

Message:

save modif from local. context_init/finalize OK

File:

• XIOS/dev/branch_yushan/src/object_template.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan/src/object_template.hpp

@@ -98 +98 @@
          /// Propriétés statiques ///
          // bkp
-         static xios_map<StdString,
-                xios_map<StdString,
-                boost::shared_ptr<DerivedType> > > AllMapObj;
-         static xios_map<StdString,
-                std::vector<boost::shared_ptr<DerivedType> > > AllVectObj;
+         // static xios_map<StdString,
+         //        xios_map<StdString,
+         //        boost::shared_ptr<DerivedType> > > AllMapObj;
+         // static xios_map<StdString,
+         //        std::vector<boost::shared_ptr<DerivedType> > > AllVectObj;
 
-         static xios_map< StdString, long int > GenId ;
+         // static xios_map< StdString, long int > GenId ;
 
          // xios_map<StdString, xios_map<StdString, boost::shared_ptr<DerivedType> > > AllMapObj;
@@ -110 +110 @@
          // xios_map< StdString, long int > GenId ;
 
-         // static xios_map<StdString, xios_map<StdString, boost::shared_ptr<DerivedType> > > *AllMapObj_ptr;
-         // static xios_map<StdString, std::vector<boost::shared_ptr<DerivedType> > > *AllVectObj_ptr;
-         // static xios_map< StdString, long int > *GenId_ptr ;
+         static xios_map<StdString, xios_map<StdString, boost::shared_ptr<DerivedType> > > *AllMapObj;
+         static xios_map<StdString, std::vector<boost::shared_ptr<DerivedType> > > *AllVectObj;
+         static xios_map< StdString, long int > *GenId;
 
-         // #pragma omp threadprivate(AllMapObj_ptr, AllVectObj_ptr, GenId_ptr)
-
+         #pragma omp threadprivate(AllMapObj, AllVectObj, GenId)
 
    }; // class CObjectTemplate