Changeset 1542 for XIOS/trunk/src/node/file.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/node/file.cpp (modified) (4 diffs)

XIOS/trunk/src/node/file.cpp

@@ -64 +64 @@
    \return data writer object.
    */
-   boost::shared_ptr<CDataOutput> CFile::getDataOutput(void) const
+   std::shared_ptr<CDataOutput> CFile::getDataOutput(void) const
    {
       return data_out;
@@ -75 +75 @@
    \return data reader object.
    */
-   boost::shared_ptr<CDataInput> CFile::getDataInput(void) const
+   std::shared_ptr<CDataInput> CFile::getDataInput(void) const
    {
       return data_in;
@@ -545 +545 @@
          if (isOpen) data_out->closeFile();
 
-        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
+        data_out = std::shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
                                                               fileComm, multifile, isCollective, time_counter_name));
         isOpen = true;
@@ -669 +669 @@
       bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false;
       if (time_counter_name.isEmpty())
-        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
+        data_in = std::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
       else
-        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
+        data_in = std::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
       isOpen = true;
     }