Changeset 769 for XIOS/trunk/src/object_factory_decl.cpp

Timestamp:

10/30/15 16:33:48 (8 years ago)

Author:

rlacroix

Message:

Keep track of whether an object id was automatically generated or not.

File:

• XIOS/trunk/src/object_factory_decl.cpp (modified) (1 diff)

XIOS/trunk/src/object_factory_decl.cpp

@@ -5 +5 @@
 {
 #define macro(U) \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString & id);  \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString & id); \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const U * const object); \
+  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \
+  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \
+  template shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \
   template int CObjectFactory::GetObjectNum<U>(void); \
   template int CObjectFactory::GetObjectIdNum<U>(void); \
-  template const std::vector<shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString & context ); \
-  template bool CObjectFactory::HasObject<U>(const StdString & id); \
-  template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString & id); \
-  template boost::shared_ptr<U> CObjectFactory::CreateObject<U>(const StdString & id ); \
-  template  StdString CObjectFactory::GenUId<U>(void);
+  template const std::vector<shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
+  template bool CObjectFactory::HasObject<U>(const StdString& id); \
+  template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString& id); \
+  template boost::shared_ptr<U> CObjectFactory::CreateObject<U>(const StdString& id ); \
+  template const StdString& CObjectFactory::GetUIdBase<U>(void); \
+  template StdString CObjectFactory::GenUId<U>(void); \
+  template bool CObjectFactory::IsGenUId<U>(const StdString& id); \
 
   macro(CField)