Changeset 1134 for XIOS/dev/branch_yushan_merged/src/object_factory.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/object_factory.cpp (modified) (1 diff)

XIOS/dev/branch_yushan_merged/src/object_factory.cpp

@@ -5 +5 @@
    /// ////////////////////// Définitions ////////////////////// ///
 
-   StdString CObjectFactory::CurrContext("");
+   StdString *CObjectFactory::CurrContext_ptr = new StdString;
 
    void CObjectFactory::SetCurrentContextId(const StdString & context)
-   { CObjectFactory::CurrContext = context; }
+   {
+     if(CObjectFactory::CurrContext_ptr == NULL ) CObjectFactory::CurrContext_ptr = new StdString;
+     CObjectFactory::CurrContext_ptr->assign(context); 
+   }
 
    StdString & CObjectFactory::GetCurrentContextId(void)
-   { return (CObjectFactory::CurrContext); }
+   { 
+     return (*CObjectFactory::CurrContext_ptr); 
+   }
 
 } // namespace xios