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/object_factory.hpp

    r769 r1542  
    22#define __XIOS_CObjectFactory__ 
    33 
    4 /// boost headers /// 
    5 #include <boost/shared_ptr.hpp> 
     4#include <memory> 
    65 
    76/// XIOS headers /// 
     
    2423 
    2524         template <typename U> 
    26             static  boost::shared_ptr<U> GetObject(const StdString & id); 
     25            static  std::shared_ptr<U> GetObject(const StdString & id); 
    2726 
    2827         template <typename U> 
    29             static  boost::shared_ptr<U> GetObject(const StdString& context,const StdString & id); 
     28            static  std::shared_ptr<U> GetObject(const StdString& context,const StdString & id); 
    3029 
    3130         template <typename U> 
    32             static  boost::shared_ptr<U> GetObject(const U * const object); 
     31            static  std::shared_ptr<U> GetObject(const U * const object); 
    3332 
    3433         template <typename U> 
     
    3837 
    3938         template <typename U> 
    40             static  const std::vector<boost::shared_ptr<U> > & 
     39            static  const std::vector<std::shared_ptr<U> > & 
    4140               GetObjectVector(const StdString & context = CObjectFactory::GetCurrentContextId()); 
    4241 
     
    5049         /// Instanciateur /// 
    5150         template <typename U> 
    52             static  boost::shared_ptr<U> CreateObject(const StdString & id = StdString("")); 
     51            static  std::shared_ptr<U> CreateObject(const StdString & id = StdString("")); 
    5352 
    5453         template <typename U> static const StdString& GetUIdBase(void); 
Note: See TracChangeset for help on using the changeset viewer.