Changeset 1542 for XIOS/trunk/src/group_factory_decl.cpp

Timestamp:

06/13/18 16:48:53 (6 years ago)

Author:

oabramkina

Message:

Replacing Boost's unordered_map and shared_pointer by its STL counterparts.

Two notes for Curie:

• one can see the content of unordered_map with ddt only if XIOS has been compiled with gnu
• XIOS will not compile any more with pgi (all available versions use old STL which are not up to the c++11 norms)

File:

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

XIOS/trunk/src/group_factory_decl.cpp

@@ -5 +5 @@
 {
 # define  macro(U) \
-  template void CGroupFactory::AddGroup<U>(shared_ptr<U> pgroup,shared_ptr<U> cgroup); \
-  template void CGroupFactory::AddChild<U>(shared_ptr<U> group, shared_ptr<U::RelChild> child); \
-  template shared_ptr<U>  CGroupFactory::GetGroup<U>(shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(shared_ptr<U> group, const StdString & id); \
-  template int CGroupFactory::GetGroupNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetGroupIdNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetChildNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetChildIdNum<U>(boost::shared_ptr<U> group); \
-  template bool CGroupFactory::HasGroup<U>(shared_ptr<U> group, const StdString & id); \
-  template bool CGroupFactory::HasChild<U>(boost::shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U> CGroupFactory::CreateGroup<U>(shared_ptr<U> group, const StdString & id ); \
-  template shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(shared_ptr<U> group, const StdString & id);
+  template void CGroupFactory::AddGroup<U>(std::shared_ptr<U> pgroup, std::shared_ptr<U> cgroup); \
+  template void CGroupFactory::AddChild<U>(std::shared_ptr<U> group, std::shared_ptr<U::RelChild> child); \
+  template std::shared_ptr<U>  CGroupFactory::GetGroup<U>(std::shared_ptr<U> group, const StdString & id); \
+  template std::shared_ptr<U::RelChild> CGroupFactory::GetChild<U>( std::shared_ptr<U> group, const StdString & id); \
+  template int CGroupFactory::GetGroupNum<U>(std::shared_ptr<U> group); \
+  template int CGroupFactory::GetGroupIdNum<U>(std::shared_ptr<U> group); \
+  template int CGroupFactory::GetChildNum<U>(std::shared_ptr<U> group); \
+  template int CGroupFactory::GetChildIdNum<U>(std::shared_ptr<U> group); \
+  template bool CGroupFactory::HasGroup<U>(std::shared_ptr<U> group, const StdString & id); \
+  template bool CGroupFactory::HasChild<U>(std::shared_ptr<U> group, const StdString & id); \
+  template std::shared_ptr<U> CGroupFactory::CreateGroup<U>(std::shared_ptr<U> group, const StdString & id ); \
+  template std::shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(std::shared_ptr<U> group, const StdString & id);
 
   macro(CFieldGroup)