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

Timestamp:

05/21/12 17:57:22 (12 years ago)

Author:

ymipsl

Message:

• Supress lot of shared_ptr
• instrument code for vampir-trace and timer diagnostic

YM

File:

• XIOS/trunk/src/group_factory_impl.hpp (modified) (7 diffs)

XIOS/trunk/src/group_factory_impl.hpp

@@ -30 +30 @@
                << " pgroup or cgroup NULL !");
       if (!child->hasId())
-         group->childList.insert(group->childList.end(), child);
+         group->childList.insert(group->childList.end(), child.get());
       else
       {
-         group->childList.insert(group->childList.end(), child);
-         group->childMap.insert(std::make_pair(child->getId(), child));
+         group->childList.insert(group->childList.end(), child.get());
+         group->childMap.insert(std::make_pair(child->getId(), child.get()));
       }
    }
@@ -47 +47 @@
       {
          boost::shared_ptr<U> value = CObjectFactory::CreateObject<U>(CObjectFactory::GenUId<U>());
-         group->groupList.insert(group->groupList.end(), value);
-         group->groupMap.insert(std::make_pair(value->getId(), value));
+         group->groupList.insert(group->groupList.end(), value.get());
+         group->groupMap.insert(std::make_pair(value->getId(), value.get()));
          return (value);
       }
@@ -56 +56 @@
       {
          boost::shared_ptr<U> value = CObjectFactory::CreateObject<U>(id);
-         group->groupList.insert(group->groupList.end(), value);
-         group->groupMap.insert(std::make_pair(id, value));
+         group->groupList.insert(group->groupList.end(), value.get());
+         group->groupMap.insert(std::make_pair(id, value.get()));
          return (value);
       }
@@ -72 +72 @@
          boost::shared_ptr<typename U::RelChild> value =
                CObjectFactory::CreateObject<typename U::RelChild>();
-         group->childList.insert(group->childList.end(), value);
-         group->childMap.insert(std::make_pair(value->getId(), value));
+         group->childList.insert(group->childList.end(), value.get());
+         group->childMap.insert(std::make_pair(value->getId(), value.get()));
          return (value);
       }
@@ -82 +82 @@
          boost::shared_ptr<typename U::RelChild> value =
                CObjectFactory::CreateObject<typename U::RelChild>(id);
-         group->childList.insert(group->childList.end(), value);
-         group->childMap.insert(std::make_pair(id, value));
+         group->childList.insert(group->childList.end(), value.get());
+         group->childMap.insert(std::make_pair(id, value.get()));
          return (value);
       }
@@ -120 +120 @@
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << " group is not referenced !");
-      return (group->groupMap[id]);
+      return (group->groupMap[id]->getShared());
    }
 
@@ -131 +131 @@
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << " child is not referenced !");
-      return (group->childMap[id]);
+      return (group->childMap[id]->getShared());
    }