Changeset 1542 for XIOS/trunk/src/group_factory.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.hpp (modified) (3 diffs)

XIOS/trunk/src/group_factory.hpp

@@ -1 +1 @@
 #ifndef __XIOS_CGroupFactory__
 #define __XIOS_CGroupFactory__
-
-/// boost headers ///
-#include <boost/shared_ptr.hpp>
 
 /// XIOS headers ///
@@ -23 +20 @@
 
          template <typename U>
-            static void AddGroup(boost::shared_ptr<U> pgroup,
-                                        boost::shared_ptr<U> cgroup);
+            static void AddGroup(std::shared_ptr<U> pgroup,
+                                        std::shared_ptr<U> cgroup);
 
          template <typename U>
-            static void AddChild(boost::shared_ptr<U> group,
-                                        boost::shared_ptr<typename U::RelChild> child);
+            static void AddChild(std::shared_ptr<U> group,
+                                        std::shared_ptr<typename U::RelChild> child);
 
          /// Accesseurs ///
@@ -34 +31 @@
 
          template <typename U>
-            static boost::shared_ptr<U>
-               GetGroup(boost::shared_ptr<U> group, const StdString & id);
+            static std::shared_ptr<U>
+               GetGroup(std::shared_ptr<U> group, const StdString & id);
 
          template <typename U>
-            static boost::shared_ptr<typename U::RelChild>
-               GetChild(boost::shared_ptr<U> group, const StdString & id);
+            static std::shared_ptr<typename U::RelChild>
+               GetChild(std::shared_ptr<U> group, const StdString & id);
 
          template <typename U>
-            static int GetGroupNum(boost::shared_ptr<U> group);
+            static int GetGroupNum(std::shared_ptr<U> group);
          template <typename U>
-            static int GetGroupIdNum(boost::shared_ptr<U> group);
+            static int GetGroupIdNum(std::shared_ptr<U> group);
          template <typename U>
-            static int GetChildNum(boost::shared_ptr<U> group);
+            static int GetChildNum(std::shared_ptr<U> group);
          template <typename U>
-            static int GetChildIdNum(boost::shared_ptr<U> group);
+            static int GetChildIdNum(std::shared_ptr<U> group);
 
          /// Tests ///
          template <typename U>
-            static bool HasGroup(boost::shared_ptr<U> group, const StdString & id);
+            static bool HasGroup(std::shared_ptr<U> group, const StdString & id);
 
          template <typename U>
-            static bool HasChild(boost::shared_ptr<U> group, const StdString & id);
+            static bool HasChild(std::shared_ptr<U> group, const StdString & id);
 
          /// Instanciateur ///
          template <typename U>
-            static boost::shared_ptr<U>
-               CreateGroup(boost::shared_ptr<U> group, const StdString & id = StdString(""));
+            static std::shared_ptr<U>
+               CreateGroup(std::shared_ptr<U> group, const StdString & id = StdString(""));
 
          template <typename U>
-            static boost::shared_ptr<typename U::RelChild>
-               CreateChild(boost::shared_ptr<U> group, const StdString & id = StdString(""));
+            static std::shared_ptr<typename U::RelChild>
+               CreateChild(std::shared_ptr<U> group, const StdString & id = StdString(""));
 
       private :