Changeset 1542 for XIOS/trunk/src/group_factory_impl.hpp

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_impl.hpp (modified) (10 diffs)

XIOS/trunk/src/group_factory_impl.hpp

@@ -9 +9 @@
 
    template <typename U>
-      void CGroupFactory::AddGroup(boost::shared_ptr<U> pgroup,
-                                   boost::shared_ptr<U> cgroup)
+      void CGroupFactory::AddGroup(std::shared_ptr<U> pgroup,
+                                   std::shared_ptr<U> cgroup)
    {
       if (cgroup.get() == NULL || pgroup.get() == NULL )
-         ERROR("CGroupFactory::AddGroup(boost::shared_ptr<U> pgroup, boost::shared_ptr<U> cgroup)",
+         ERROR("CGroupFactory::AddGroup(std::shared_ptr<U> pgroup, std::shared_ptr<U> cgroup)",
                << " pgroup or cgroup NULL !");
       if (!cgroup->hasId())
@@ -25 +25 @@
 
    template <typename U>
-      void CGroupFactory::AddChild(boost::shared_ptr<U> group,
-                                   boost::shared_ptr<typename U::RelChild> child)
+      void CGroupFactory::AddChild(std::shared_ptr<U> group,
+                                   std::shared_ptr<typename U::RelChild> child)
    {
       if (group.get() == NULL || child.get() == NULL )
-         ERROR("CGroupFactory::AddGroup(boost::shared_ptr<U> pgroup, boost::shared_ptr<U> cgroup)",
+         ERROR("CGroupFactory::AddGroup(std::shared_ptr<U> pgroup, std::shared_ptr<U> cgroup)",
                << " pgroup or cgroup NULL !");
       if (!child->hasId())
@@ -41 +41 @@
 
    template <typename U>
-      boost::shared_ptr<U>
-         CGroupFactory::CreateGroup(boost::shared_ptr<U> group, const StdString & id)
+      std::shared_ptr<U>
+         CGroupFactory::CreateGroup(std::shared_ptr<U> group, const StdString & id)
    {
       CObjectFactory::SetCurrentContextId
@@ -48 +48 @@
       if (id.size() == 0)
       {
-         boost::shared_ptr<U> value = CObjectFactory::CreateObject<U>(CObjectFactory::GenUId<U>());
+         std::shared_ptr<U> value = CObjectFactory::CreateObject<U>(CObjectFactory::GenUId<U>());
          group->groupList.insert(group->groupList.end(), value.get());
          group->groupMap.insert(std::make_pair(value->getId(), value.get()));
@@ -57 +57 @@
       else
       {
-         boost::shared_ptr<U> value = CObjectFactory::CreateObject<U>(id);
+         std::shared_ptr<U> value = CObjectFactory::CreateObject<U>(id);
          group->groupList.insert(group->groupList.end(), value.get());
          group->groupMap.insert(std::make_pair(id, value.get()));
@@ -65 +65 @@
 
    template <typename U>
-      boost::shared_ptr<typename U::RelChild>
-         CGroupFactory::CreateChild(boost::shared_ptr<U> group, const StdString & id)
+      std::shared_ptr<typename U::RelChild>
+         CGroupFactory::CreateChild(std::shared_ptr<U> group, const StdString & id)
    {
       CObjectFactory::SetCurrentContextId
@@ -72 +72 @@
       if (id.size() == 0)
       {
-         boost::shared_ptr<typename U::RelChild> value =
+         std::shared_ptr<typename U::RelChild> value =
                CObjectFactory::CreateObject<typename U::RelChild>();
          group->childList.insert(group->childList.end(), value.get());
@@ -82 +82 @@
       else
       {
-         boost::shared_ptr<typename U::RelChild> value =
+         std::shared_ptr<typename U::RelChild> value =
                CObjectFactory::CreateObject<typename U::RelChild>(id);
          group->childList.insert(group->childList.end(), value.get());
@@ -91 +91 @@
 
    template <typename U>
-      bool CGroupFactory::HasGroup(boost::shared_ptr<U> group, const StdString & id)
+      bool CGroupFactory::HasGroup(std::shared_ptr<U> group, const StdString & id)
    {  return (group->groupMap.find(id) != group->groupMap.end()); }
 
    template <typename U>
-      bool CGroupFactory::HasChild(boost::shared_ptr<U> group, const StdString & id)
+      bool CGroupFactory::HasChild(std::shared_ptr<U> group, const StdString & id)
    {  return (group->childMap.find(id) != group->childMap.end()); }
 
    template <typename U>
-      int CGroupFactory::GetGroupNum(boost::shared_ptr<U> group)
+      int CGroupFactory::GetGroupNum(std::shared_ptr<U> group)
    { return (group->groupList.size()); }
 
    template <typename U>
-      int CGroupFactory::GetGroupIdNum(boost::shared_ptr<U> group)
+      int CGroupFactory::GetGroupIdNum(std::shared_ptr<U> group)
    { return (group->groupMap.size()); }
 
    template <typename U>
-      int CGroupFactory::GetChildNum(boost::shared_ptr<U> group)
+      int CGroupFactory::GetChildNum(std::shared_ptr<U> group)
    { return (group->childList.size()); }
 
    template <typename U>
-      int CGroupFactory::GetChildIdNum(boost::shared_ptr<U> group)
+      int CGroupFactory::GetChildIdNum(std::shared_ptr<U> group)
    { return (group->childMap.size()); }
 
    template <typename U>
-      boost::shared_ptr<U>
-         CGroupFactory::GetGroup(boost::shared_ptr<U> group, const StdString & id)
+      std::shared_ptr<U>
+         CGroupFactory::GetGroup(std::shared_ptr<U> group, const StdString & id)
    {
       if (!CGroupFactory::HasGroup<U>(group, id))
-         ERROR("CGroupFactory::GetGroup(boost::shared_ptr<U> group, const StdString & id)",
+         ERROR("CGroupFactory::GetGroup(std::shared_ptr<U> group, const StdString & id)",
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << " group is not referenced !");
@@ -126 +126 @@
 
    template <typename U>
-      boost::shared_ptr<typename U::RelChild>
-         CGroupFactory::GetChild(boost::shared_ptr<U> group, const StdString & id)
+      std::shared_ptr<typename U::RelChild>
+         CGroupFactory::GetChild(std::shared_ptr<U> group, const StdString & id)
    {
       if (!CGroupFactory::HasChild<U>(group, id))
-         ERROR("CGroupFactory::GetChild(boost::shared_ptr<U> group, const StdString & id)",
+         ERROR("CGroupFactory::GetChild(std::shared_ptr<U> group, const StdString & id)",
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << " child is not referenced !");