Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/node/context.cpp

    r1489 r1542  
    2323namespace xios { 
    2424 
    25   shared_ptr<CContextGroup> CContext::root; 
     25  std::shared_ptr<CContextGroup> CContext::root; 
    2626 
    2727   /// ////////////////////// Définitions ////////////////////// /// 
     
    6666   CContextGroup* CContext::getRoot(void) 
    6767   { 
    68       if (root.get()==NULL) root=shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName())); 
     68      if (root.get()==NULL) root=std::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName())); 
    6969      return root.get(); 
    7070   } 
     
    7676   \return Calendar 
    7777   */ 
    78    boost::shared_ptr<CCalendar> CContext::getCalendar(void) const 
     78   std::shared_ptr<CCalendar> CContext::getCalendar(void) const 
    7979   { 
    8080      return (this->calendar); 
     
    8787   \param[in] newCalendar new calendar 
    8888   */ 
    89    void CContext::setCalendar(boost::shared_ptr<CCalendar> newCalendar) 
     89   void CContext::setCalendar(std::shared_ptr<CCalendar> newCalendar) 
    9090   { 
    9191      this->calendar = newCalendar; 
     
    14141414     idServer_ = this->getId(); 
    14151415     idServer_ += "_server_"; 
    1416      idServer_ += boost::lexical_cast<string>(i); 
     1416     idServer_ += std::to_string(static_cast<unsigned long long>(i)); 
    14171417     return idServer_; 
    14181418   } 
Note: See TracChangeset for help on using the changeset viewer.