Changeset 2629


Ignore:
Timestamp:
04/25/24 15:05:23 (2 weeks ago)
Author:
jderouillat
Message:

Delete boost dependencies, the few features used are replaced by functions stored in extern/boost_extraction

Location:
XIOS3/trunk
Files:
4 added
3 deleted
110 edited

Legend:

Unmodified
Added
Removed

  • XIOS3/trunk/bld.cfg

    r2574 r2629  
    7171bld::tool::fpp       %FPP 
    7272bld::tool::cpp       %CPP 
    73 bld::tool::cppflags  %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include  
    74 bld::tool::fppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include  
     73bld::tool::cppflags  %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost_extraction/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include  
     74bld::tool::fppflags  %BASE_INC -I${PWD}/extern/boost_extraction/include -I${PWD}/extern/rapidxml/include  
    7575bld::tool::ld        %LINKER 
    7676bld::tool::ldflags   %LD_FLAGS  
    77 bld::tool::cflags    %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include  
     77bld::tool::cflags    %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost_extraction/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include  
    7878bld::tool::fflags    %FFLAGS %FBASE_INC  
    7979bld::tool::cppkeys   %CPP_KEY 

  • XIOS3/trunk/make_xios

    r2608 r2629  
    77build_dir="./" 
    88build_suffixed="false" 
    9 use_extern_boost="false" 
    109use_extern_blitz="false" 
    1110use_memtrack="false" 
    … …  
    3736        echo "       [--build_dir : name of the build directory" 
    3837        echo "       [--build_suffixed : generate automatically suffixed name of the build directory (e.g. config_X64_CURIE_prod)" 
    39         echo "       [--use_extern_boost : to use external boost library" 
    4038        echo "       [--use_extern_blitz : to use external blitz library" 
    4139            echo "       [--doc] : to generate Doxygen documentation (not available yet)" 
    … …  
    5856         "--build_dir")  build_dir=$2     ; shift ; shift ;; 
    5957         "--build_suffixed")  build_suffixed="true" ; shift  ;; 
    60          "--use_extern_boost")  use_extern_boost="true" ; shift  ;; 
    6158         "--use_extern_blitz")  use_extern_blitz="true" ; shift  ;; 
    6259         "--doc")   doc="true"          ; shift ;; 
    … …  
    7572    echo -e "- uncompress archives ..."          
    7673    for tarname in `ls $install_dir/tools/archive/*.tar.gz` ; do 
    77         if  ( [[ ${tarname} == "${install_dir}/tools/archive/boost.tar.gz" ]] && [[ "$use_extern_boost" == "true" ]] ) || ( [[ ${tarname} == "${install_dir}/tools/archive/blitz.tar.gz" ]] && [[ "$use_extern_blitz" == "true" ]] ) 
     74        if  ( [[ ${tarname} == "${install_dir}/tools/archive/blitz.tar.gz" ]] && [[ "$use_extern_blitz" == "true" ]] ) 
    7875        then 
    7976                continue 
    … …  
    281278# End "Detecting if parallel compression is available" 
    282279 
    283  
    284280# Setting path for boost 
    285 if [[ "$use_extern_boost" == "true" ]] 
    286 then 
    287    rm -r $PWD/extern/boost 
    288    ln -s $PWD/.void_dir $PWD/extern/boost 
    289 else 
    290    export BOOST_INCDIR="-I${PWD}/extern/boost" 
    291    export BOOST_LIBDIR="" 
    292    export BOOST_LIB="" 
    293 fi 
     281export BOOST_INCDIR="-I${PWD}/extern/boost_extraction/include" 
    294282 
    295283# Setting path for blitz 

  • XIOS3/trunk/src/attribute.hpp

    r2388 r2629  
    33 
    44/// boost headers /// 
    5 #include <boost/any.hpp> 
    65 
    76/// XIOS headers /// 

  • XIOS3/trunk/src/attribute_template.hpp

    r2388 r2629  
    33 
    44/// boost headers /// 
    5 #include <boost/lexical_cast.hpp> 
    65 
    76/// XIOS headers /// 

  • XIOS3/trunk/src/attribute_template_impl.hpp

    r2388 r2629  
    245245      { 
    246246         return CType<T>::toBuffer(buffer) ; 
    247 /* 
    248          if (isEmpty()) return buffer.put(true) ; 
    249          else 
    250          { 
    251            bool ret=true ; 
    252            CType<T> val(*boost::any_cast<T>(&value)) ; 
    253            ret&=buffer.put(false) ; 
    254            ret&=val.toBuffer(buffer) ; 
    255            return ret ; 
    256          } 
    257 */ 
    258247      } 
    259248 
    … …  
    262251      { 
    263252        return CType<T>::fromBuffer(buffer) ; 
    264 /* 
    265         bool empty ; 
    266         bool ret=true ; 
    267         ret&=buffer.get(empty) ; 
    268         if (empty) 
    269         { 
    270           clear() ; 
    271           return ret ; 
    272         } 
    273         else 
    274         { 
    275           if (isEmpty()) 
    276           { 
    277             T val ; 
    278             setValue(val) ; 
    279           } 
    280           T* V=const_cast<T*>(boost::any_cast<T>(&value)) ; 
    281           CType<T> val(*V) ; 
    282           return val.fromBuffer(buffer) ; 
    283         } 
    284 */ 
    285       } 
    286 /* 
    287       template <class T> 
    288       size_t CAttributeTemplate<T>::size(void) const 
    289       { 
    290         return CType<T>::size() ;*/ 
    291 /* 
    292         if (isEmpty()) return sizeof(bool) ; 
    293         else 
    294         { 
    295           CType<T> val(*const_cast<T*>(boost::any_cast<T>(&value))) ; 
    296           return val.size()+sizeof(bool) ; 
    297         } 
    298 */ 
    299  /*     }*/ 
     253      } 
    300254 
    301255      template <typename T> 

  • XIOS3/trunk/src/attribute_template_specialisation.hpp

    r501 r2629  
    66namespace xios 
    77{ 
    8 /* 
    9       /// ////////////////////// Définitions ////////////////////// /// 
    10  
    11       /// Spécialisations des templates pour la fonction [toString] /// 
    12        
    13       template <> 
    14          StdString CAttributeTemplate<bool>::toString(void) const 
    15       { 
    16          StdOStringStream oss; 
    17          if (!this->isEmpty() && this->hasId()) 
    18          { 
    19             if (this->getValue()) 
    20                oss << this->getName() << "=\".TRUE.\""; 
    21             else 
    22                oss << this->getName() << "=\".FALSE.\""; 
    23          } 
    24          return (oss.str()); 
    25       } 
    26  
    27       //--------------------------------------------------------------- 
    28  
    29       /// Spécialisations des templates pour la fonction [fromString] /// 
    30  
    31       template <> // Chaîne de caractÚres. 
    32          void CAttributeTemplate<StdString>::fromString(const StdString & str) 
    33       {  
    34          this->setValue(str);  
    35       } 
    36  
    37       template <> // Entier 
    38          void CAttributeTemplate<int>::fromString(const StdString & str) 
    39       { 
    40          try 
    41          { 
    42             this->setValue(boost::lexical_cast<int>(str)); 
    43          } 
    44          catch(boost::bad_lexical_cast &) 
    45          { 
    46             ERROR("void CAttributeTemplate<int>::fromString(const StdString & str)", 
    47                   << "[ str = " << str << " ] Bad cast !"); 
    48          } 
    49       } 
    50  
    51       template <> // Double 
    52          void CAttributeTemplate<double>::fromString(const StdString & str) 
    53       { 
    54          if (str.find("max") != StdString::npos) 
    55          { 
    56             this->setValue(DBL_MAX); 
    57             return; 
    58          } 
    59          if (str.find("min") != StdString::npos) 
    60          { 
    61             this->setValue(DBL_MIN); 
    62             return; 
    63          } 
    64           
    65          try 
    66          { 
    67             this->setValue(boost::lexical_cast<double>(str)); 
    68          } 
    69          catch(boost::bad_lexical_cast &) 
    70          { 
    71             ERROR("void CAttributeTemplate<double>::fromString(const StdString & str)", 
    72                   << "[ str = " << str << " ] Bad cast !"); 
    73          } 
    74       } 
    75  
    76       template <> // Booléen 
    77          void CAttributeTemplate<bool>::fromString(const StdString & str) 
    78       { 
    79          if (str.find(".TRUE.") != StdString::npos) 
    80             this->setValue(true); 
    81          else 
    82             this->setValue(false); 
    83       } 
    84  
    85       //--------------------------------------------------------------- 
    86  
    87       template<> // Tableau 
    88          void CAttributeTemplate<ARRAY(double, 1)>::fromString(const StdString & str) 
    89       { 
    90          ARRAY_CREATE(array_sptr, double, 1, [1]); 
    91          CArray<double, 1> & array = *array_sptr; 
    92          this->setValue(array_sptr); 
    93  
    94          StdIStringStream iss(str) ; 
    95          char c = '\0'; int size = 0; 
    96          double d = 0.,valsup = 0., valinf = 0.; 
    97          std::vector<double> vect; 
    98  
    99          iss >> d; vect.push_back(d); 
    100          size = vect.size(); 
    101          if (!iss.eof ()) 
    102          { 
    103             iss >> c; 
    104             switch (c) 
    105             { 
    106                case ',' : // Le tableau est généré valeur par valeur. 
    107                   iss.unget(); 
    108                   while(!iss.eof ()) 
    109                   { // On récupÚre chacune des valeurs une par une jusqu'à ce que le buffer soit vide. 
    110                      iss >> c >> d; 
    111                      if (c != ',') 
    112                         ERROR("CAttributeTemplate<ARRAY(...)>::fromString(const StdString & str)", 
    113                               << "[ str = " << str << " ] bad definition of array !"); 
    114                      vect.push_back(d); 
    115                   } 
    116                   size = vect.size(); 
    117                   break; 
    118                case '(' : // Le tableau est généré automatiquement. 
    119                   if (!iss.eof ()) 
    120                   { // on récupÚre la borne supérieure 
    121                      valinf = d; 
    122                      iss >> size >> c >> d; 
    123                      if ((c != ')') || (size <= 0)) 
    124                         ERROR("CAttributeTemplate<ARRAY(...)>::fromString(const StdString & str)", 
    125                               << "[ str = " << str << " ] bad definition of array !"); 
    126                      valsup = d; 
    127                   } 
    128                   d = (valsup - valinf) / (double)(size - 1); 
    129                   for (int j = 1; j <= size; j++) 
    130                      vect.push_back(valinf + j * d); 
    131                   break; 
    132                default : 
    133                   ERROR("CAttributeTemplate<ARRAY(...)>::fromString(const StdString & str)", 
    134                         << "[ str = " << str << " ] bad definition of array !"); 
    135             } 
    136          } 
    137  
    138          array.resize(boost::extents[size]); 
    139          for (int i = 0; i < size; i++) 
    140             array[i] = vect[i];  
    141  
    142       } 
    143  
    144       //--------------------------------------------------------------- 
    145  
    146       /// Spécialisations des templates pour la fonction [toBinary] /// 
    147  
    148       template <> // Chaîne de caractÚres. 
    149          void CAttributeTemplate<StdString>::toBinary (StdOStream & os) const 
    150       { 
    151          StdString str = this->getValue(); 
    152          StdSize size = str.size(); 
    153          os.write (reinterpret_cast<const char*>(&size) , sizeof(StdSize)); 
    154          os.write (str.data(), size * sizeof(char)); 
    155       } 
    156  
    157       template <> // Entier 
    158          void CAttributeTemplate<int>::toBinary(StdOStream & os) const 
    159       { 
    160          int value = this->getValue(); 
    161          os.write (reinterpret_cast<const char*>(&value) , sizeof(int)); 
    162       } 
    163  
    164       template <> // Booléen 
    165          void CAttributeTemplate<bool>::toBinary(StdOStream & os) const 
    166       { 
    167          bool value = this->getValue(); 
    168          os.write (reinterpret_cast<const char*>(&value) , sizeof(bool)); 
    169       } 
    170  
    171       template <> // Double 
    172          void CAttributeTemplate<double>::toBinary(StdOStream & os) const 
    173       { 
    174          double value = this->getValue(); 
    175          os.write (reinterpret_cast<const char*>(&value) , sizeof(double)); 
    176       } 
    177  
    178       //--------------------------------------------------------------- 
    179  
    180       /// Spécialisations des templates pour la fonction [fromBinary] /// 
    181  
    182       template <> // Chaîne de caractÚres. 
    183          void CAttributeTemplate<StdString>::fromBinary(StdIStream & is) 
    184       { 
    185          StdSize size = 0; 
    186          is.read (reinterpret_cast<char*>(&size), sizeof(StdSize)); 
    187          StdString value(size, ' '); 
    188          is.read (const_cast<char *>(value.data()), size * sizeof(char)); 
    189          this->setValue(value); 
    190       } 
    191  
    192       template <> // Entier 
    193          void CAttributeTemplate<int>::fromBinary(StdIStream & is) 
    194       { 
    195          int value = 0; 
    196          is.read (reinterpret_cast<char*>(&value), sizeof(int)); 
    197          this->setValue(value); 
    198       } 
    199  
    200       template <> // Booléen 
    201          void CAttributeTemplate<bool>::fromBinary(StdIStream & is) 
    202       { 
    203          bool value = false; 
    204          is.read (reinterpret_cast<char*>(&value), sizeof(bool)); 
    205          this->setValue(value); 
    206       } 
    207  
    208       template <> // Double 
    209          void CAttributeTemplate<double>::fromBinary(StdIStream & is) 
    210       { 
    211          double value = 0.; 
    212          is.read (reinterpret_cast<char*>(&value), sizeof(double)); 
    213          this->setValue(value); 
    214       } 
    215       ///-------------------------------------------------------------- 
    216 */ 
    2178} // namespace xios 

  • XIOS3/trunk/src/client.cpp

    r2628 r2629  
    33#include "cxios.hpp" 
    44#include "client.hpp" 
    5 #include <boost/functional/hash.hpp> 
    65#include "type.hpp" 
    76#include "context.hpp" 

  • XIOS3/trunk/src/cxios.cpp

    r2547 r2629  
    55#include "server.hpp" 
    66#include "xml_parser.hpp" 
    7 #include <boost/functional/hash.hpp> 
    87#include "mpi.hpp" 
    98#include "memory.hpp" 

  • XIOS3/trunk/src/date.cpp

    r1496 r2629  
    33#include "calendar_type.hpp" 
    44#include "calendar_util.hpp" 
    5 #include <boost/date_time/gregorian/gregorian.hpp> 
    6 #include <boost/date_time/posix_time/posix_time.hpp> 
    7  
    8 using namespace boost::posix_time; 
    9 using namespace boost::gregorian; 
    105 
    116namespace xios 

  • XIOS3/trunk/src/distribution/client_server_mapping_distributed.cpp

    r1918 r2629  
    1010#include "client_server_mapping_distributed.hpp" 
    1111#include <limits> 
    12 #include <boost/functional/hash.hpp> 
    1312#include "utils.hpp" 
    1413#include "mpi_tag.hpp" 

  • XIOS3/trunk/src/exception.cpp

    r1622 r2629  
    22 
    33/// boost headers /// 
    4 #include <boost/cast.hpp> 
    54#include "client.hpp" 
    65#include "server.hpp" 
    … …  
    5251 
    5352   StdOStringStream &  CException::getStream(void) 
    54 //   { return (*boost::polymorphic_cast<StdOStringStream*>(this)); } 
    5553   { return stream; } 
    5654 

  • XIOS3/trunk/src/exception.hpp

    r2282 r2629  
    55#include "xios_spl.hpp" 
    66#include "object.hpp" 
     7#include <boost_extract.hpp> 
    78#include <iomanip> 
    89#include <stdexcept> 
    … …  
    5960#define FILE_NAME (std::strrchr("/" __FILE__, '/') + 1) 
    6061 
    61 #define FUNCTION_NAME (StdString(BOOST_CURRENT_FUNCTION).length() > 100 ? \ 
    62                        StdString(BOOST_CURRENT_FUNCTION).substr(0,100).append("...)") : BOOST_CURRENT_FUNCTION) 
     62#define FUNCTION_NAME (StdString(XIOS_CURRENT_FUNCTION).length() > 100 ? \ 
     63                       StdString(XIOS_CURRENT_FUNCTION).substr(0,100).append("...)") : XIOS_CURRENT_FUNCTION) 
    6364 
    6465#define INFO(x) \ 
    65    "In file \""<< FILE_NAME <<"\", function \"" << BOOST_CURRENT_FUNCTION <<"\",  line " << __LINE__ << " -> " x << std::endl; 
     66   "In file \""<< FILE_NAME <<"\", function \"" << XIOS_CURRENT_FUNCTION <<"\",  line " << __LINE__ << " -> " x << std::endl; 
    6667 
    6768#ifdef __XIOS_DEBUG 

  • XIOS3/trunk/src/filter/temporal_filter.hpp

    r2193 r2629  
    33 
    44#include "filter.hpp" 
    5 #include <boost/smart_ptr/scoped_ptr.hpp> 
    65#include "functor.hpp" 
    76#include "array_new.hpp" 
    … …  
    6059      // Warning the declaration order matters here, double-check the constructor before changing it 
    6160      CArray<double, 1> tmpData; //!< The array of data used for temporary storage 
    62       const boost::scoped_ptr<func::CFunctor> functor; //!< The functor corresponding to the temporal operation 
     61      const std::unique_ptr<func::CFunctor> functor; //!< The functor corresponding to the temporal operation 
    6362      const bool isOnceOperation; //!< True if the operation should be computed just once 
    6463      const bool isInstantOperation; //!< True if the operation is instant 

  • XIOS3/trunk/src/group_parser.hpp

    r591 r2629  
    33 
    44/// boost headers /// 
    5 #include <boost/cast.hpp> 
     5#include <boost_extract.hpp> 
    66 
    77namespace xios 
    … …  
    3333           V* group_ptr = (this->hasId())  
    3434         ? V::get(this->getId()) 
    35          : boost::polymorphic_downcast<V*>(this); 
     35         : xios_polymorphic_downcast<V*>(this); 
    3636 
    3737      if (!(node.goToChildElement())) 
    … …  
    9090           V* group_ptr = (this->hasId())  
    9191         ? V::get(this->getId()) 
    92          : boost::polymorphic_downcast<V*>(this); 
     92         : xios_polymorphic_downcast<V*>(this); 
    9393 
    9494          StdString name = node.getElementName(); 

  • XIOS3/trunk/src/group_template_impl.hpp

    r2614 r2629  
    1212#include "type.hpp" 
    1313#include "type_util.hpp" 
    14  
     14#include <boost_extract.hpp> 
    1515 
    1616namespace xios 
    … …  
    340340           V* group_ptr = (this->hasId())  
    341341         ? V::get(this->getId()) 
    342          : boost::polymorphic_downcast<V*>(this); 
     342         : xios_polymorphic_downcast<V*>(this); 
    343343 
    344344      if (!(node.goToChildElement())) 
    … …  
    396396           V* group_ptr = (this->hasId())  
    397397         ? V::get(this->getId()) 
    398          : boost::polymorphic_downcast<V*>(this); 
     398         : xios_polymorphic_downcast<V*>(this); 
    399399 
    400400          StdString name = node.getElementName(); 

  • XIOS3/trunk/src/indent_xml.cpp

    r501 r2629  
    22 
    33/// boost headers /// 
    4 #include <boost/algorithm/string.hpp> 
    5 #include <boost/algorithm/string/split.hpp> 
     4#include <boost_extract.hpp> 
    65 
    76namespace xios 
    … …  
    3231      StdOStringStream retvalue; 
    3332      std::vector<StdString> str; 
    34       boost::split(str, content, boost::is_any_of("\n")); 
     33      xios_split<std::vector<StdString>>(str, content, "\n"); 
    3534       
    3635      std::vector<StdString>::iterator it = str.begin(), end = str.end(); 

  • XIOS3/trunk/src/interface/c/icaxis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/iccalendar_wrapper.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/iccompute_connectivity_domain.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include "xios.hpp" 

  • XIOS3/trunk/src/interface/c/iccontext.cpp

    r2607 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icdata.cpp

    r2628 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77#include <string> 

  • XIOS3/trunk/src/interface/c/icdate.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include "xios.hpp" 

  • XIOS3/trunk/src/interface/c/icdomain.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icduplicate_scalar_to_axis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/icexpand_domain.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icextract_domain.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icextract_to_axis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/icextract_to_scalar.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/icfield.cpp

    r1869 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icfile.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/icgenerate_rectilinear_domain.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icgrid.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include "xios.hpp" 

  • XIOS3/trunk/src/interface/c/icinterpolate.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include "xios.hpp" 

  • XIOS3/trunk/src/interface/c/icinverse_axis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icreduce_axis_to_axis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icreduce_scalar_to_scalar.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icreduce_to_axis.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icreduce_to_scalar.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include "xios.hpp" 

  • XIOS3/trunk/src/interface/c/icreorder_domain.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icscalar.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/ictemporal_splitting.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icvariable.cpp

    r1622 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c/icxml_tree.cpp

    r1542 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include <memory> 
    77 

  • XIOS3/trunk/src/interface/c/iczoom.cpp

    r2339 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66 
    77#include <memory> 

  • XIOS3/trunk/src/interface/c_attr/icaxis_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/iccalendar_wrapper_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/iccompute_connectivity_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/iccontext_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icdomain_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icduplicate_scalar_to_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icexpand_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icextract_axis_to_scalar_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icextract_domain_attr.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icextract_domain_to_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icfield_attr.cpp

    r2617 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icfieldgroup_attr.cpp

    r2617 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icfile_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icfilegroup_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icgenerate_rectilinear_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icgrid_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icgridgroup_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icinterpolate_axis_attr.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icinterpolate_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icinverse_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
    65#include "xios.hpp" 
    76#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icredistribute_axis_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
    65#include "xios.hpp" 
    76#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icredistribute_domain_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
    65#include "xios.hpp" 
    76#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icredistribute_scalar_attr.cpp

    r2616 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
    65#include "xios.hpp" 
    76#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreduce_axis_to_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreduce_axis_to_scalar_attr.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreduce_domain_to_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreduce_domain_to_scalar_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreduce_scalar_to_scalar_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icreorder_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icscalar_attr.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icscalargroup_attr.cpp

    r2338 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/ictemporal_splitting_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icvariable_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/icvariablegroup_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/iczoom_axis_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/interface/c_attr/iczoom_domain_attr.cpp

    r1626 r2629  
    33 * ************************************************************************** */ 
    44 
    5 #include <boost/multi_array.hpp> 
     5 
    66#include "xios.hpp" 
    77#include "attribute_template.hpp" 

  • XIOS3/trunk/src/io/inetcdf4.cpp

    r2308 r2629  
    33#include "netCdf_cf_constant.hpp" 
    44 
    5 #include <boost/algorithm/string.hpp> 
     5#include <boost_extract.hpp> 
    66 
    77namespace xios 
    … …  
    435435    StdString value = this->getCoordinatesId(name, path); 
    436436 
    437     boost::split(retvalue, value, boost::is_any_of(" ")); 
     437    xios_split<std::list<StdString>>(retvalue, value, " "); 
    438438 
    439439    std::list<StdString>::iterator it = retvalue.begin(), end = retvalue.end(); 

  • XIOS3/trunk/src/io/nc4_data_output.cpp

    r2628 r2629  
    1414 
    1515#include <limits.h> 
     16#include <cfloat> 
    1617#define X_FLOAT_MAX     FLT_MAX 
    1718#define X_FLOAT_MIN     FLT_MIN 
    … …  
    19721973           {  // Ecriture des coordonnes 
    19731974 
    1974               StdString coordstr; //boost::algorithm::join(coodinates, " ") 
     1975              StdString coordstr; 
    19751976              std::vector<StdString>::iterator 
    19761977                 itc = coodinates.begin(), endc = coodinates.end(); 

  • XIOS3/trunk/src/node/field.cpp

    r2628 r2629  
    2525#include "tracer.hpp" 
    2626#include "graph_package.hpp" 
     27#include <boost_extract.hpp> 
    2728 
    2829namespace xios 
    … …  
    682683    if (hasExpression()) 
    683684    { 
    684       boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0')); 
     685      std::unique_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0')); 
    685686      filterExpr = expr->reduce(gc, *this); 
    686687       
    … …  
    13901391 
    13911392    CFieldGroup* group = CFieldGroup::get(gref); 
    1392     CFieldGroup* owner = CFieldGroup::get(boost::polymorphic_downcast<CFieldGroup*>(this)); 
     1393    CFieldGroup* owner = CFieldGroup::get(xios_polymorphic_downcast<CFieldGroup*>(this)); 
    13931394    owner->setAttributes(group); // inherite of attributes of group reference 
    13941395       

  • XIOS3/trunk/src/node/mesh.cpp

    r2409 r2629  
    66 
    77#include "mesh.hpp" 
    8 #include <boost/functional/hash.hpp> 
     8#include "utils.hpp" 
    99//#include <unordered_map> 
    1010 
    … …  
    21032103    CArray<double, 2> faceToNodes (nvertex, nbFaces); 
    21042104 
    2105     std::unordered_map <pairDouble, int, boost::hash<pairDouble> > mapNodes; 
     2105    std::unordered_map <pairDouble, int, pair_xios_hash> mapNodes; 
    21062106 
    21072107    for (int nf = 0; nf < nbFaces; ++nf) 
    … …  
    21192119 
    21202120    // faceToFaces connectivity 
    2121     std::unordered_map <pairInt, int, boost::hash<pairInt> > mapEdges; 
     2121    std::unordered_map <pairInt, int, pair_xios_hash> mapEdges; 
    21222122    faceToFaces.resize(nvertex, nbFaces); 
    21232123    CArray<int, 2> edgeToFaces(2, nbFaces*nvertex); // max possible 

  • XIOS3/trunk/src/node/variable.cpp

    r2627 r2629  
    99#include "context.hpp" 
    1010#include "context_client.hpp" 
    11 #include <boost/algorithm/string.hpp> 
     11#include <boost_extract.hpp> 
    1212 
    1313namespace xios { 
    … …  
    6060               << " ] variable is not defined !. It does not have any content. See error log for more details."); 
    6161      } 
    62       content = boost::trim_copy(content) ; 
     62      content = xios_trim_copy(content) ; 
    6363   } 
    6464 
    … …  
    231231           endid   = content.find_first_of ( " \r\n\t=", beginid ); 
    232232           subid   = content.substr ( beginid, endid-beginid); 
    233            subid   = boost::to_lower_copy(boost::trim_copy(subid)) ; 
     233           subid   = xios_to_lower_copy(xios_trim_copy(subid)) ; 
    234234 
    235235           begindata = content.find_first_of ( "=", endid ) + 1; 
    236236           enddata   = content.find_first_of ( ";", begindata ); 
    237237           subdata   = content.substr ( begindata, enddata-begindata); 
    238            subdata   = boost::trim_copy(subdata) ; 
     238           subdata   = xios_trim_copy(subdata) ; 
    239239           group_ptr->createChild(subid)->content = subdata ; 
    240240        } 

  • XIOS3/trunk/src/object_template_impl.hpp

    r2620 r2629  
    510510     oss << " * ************************************************************************** */" << iendl; 
    511511     oss << iendl; 
    512      oss << "#include <boost/multi_array.hpp>" << iendl; 
    513512     oss << "#include \"xios.hpp\"" << iendl; 
    514513     oss << "#include \"attribute_template.hpp\"" << iendl; 

  • XIOS3/trunk/src/parse_expr/filter_expr_node.cpp

    r2194 r2629  
    4545         
    4646      } 
    47       else ERROR("boost::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const", 
     47      else ERROR("std::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const", 
    4848                  << "The field " << id << " does not exist."); 
    4949    } 

  • XIOS3/trunk/src/parse_expr/filter_expr_node.hpp

    r1542 r2629  
    33 
    44#include <string> 
    5 #include <boost/smart_ptr/scoped_ptr.hpp> 
     5#include <memory> 
    66#include "scalar_expr_node.hpp" 
    77 
    … …  
    9090    private: 
    9191      std::string opId; //!< The identifier of the field 
    92       boost::scoped_ptr<IFilterExprNode> child; //!< The child node to which the operator is applied 
     92      std::unique_ptr<IFilterExprNode> child; //!< The child node to which the operator is applied 
    9393  }; 
    9494 
    … …  
    115115    private: 
    116116      std::string opId; //!< The identifier of the field 
    117       boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
    118       boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
     117      std::unique_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
     118      std::unique_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
    119119  }; 
    120120 
    … …  
    141141    private: 
    142142      std::string opId; //!< The identifier of the field 
    143       boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
    144       boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
     143      std::unique_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
     144      std::unique_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
    145145  }; 
    146146 
    … …  
    166166    private: 
    167167      std::string opId; //!< The identifier of the field 
    168       boost::scoped_ptr<IFilterExprNode> child1, child2; //!< The field child nodes to which the operator is applied 
     168      std::unique_ptr<IFilterExprNode> child1, child2; //!< The field child nodes to which the operator is applied 
    169169  }; 
    170170 
    … …  
    194194    private: 
    195195      std::string opId; //!< The identifier of the field 
    196       boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
    197       boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
    198       boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
     196      std::unique_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
     197      std::unique_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
     198      std::unique_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
    199199  }; 
    200200 
    … …  
    223223    private: 
    224224      std::string opId; //!< The identifier of the field 
    225       boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
    226       boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
    227       boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
     225      std::unique_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
     226      std::unique_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
     227      std::unique_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
    228228  }; 
    229229 
    … …  
    252252    private: 
    253253      std::string opId; //!< The identifier of the field 
    254       boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
    255       boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
    256       boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
     254      std::unique_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied 
     255      std::unique_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
     256      std::unique_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
    257257  }; 
    258258 
    … …  
    282282    private: 
    283283      std::string opId; //!< The identifier of the field 
    284       boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
    285       boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
    286       boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
     284      std::unique_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
     285      std::unique_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
     286      std::unique_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
    287287  }; 
    288288 
    … …  
    311311    private: 
    312312      std::string opId; //!< The identifier of the field 
    313       boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
    314       boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
    315       boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
     313      std::unique_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
     314      std::unique_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied 
     315      std::unique_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
    316316  }; 
    317317 
    … …  
    339339    private: 
    340340      std::string opId; //!< The identifier of the field 
    341       boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
    342       boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
    343       boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
     341      std::unique_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
     342      std::unique_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
     343      std::unique_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied 
    344344  }; 
    345345 
    … …  
    368368    private: 
    369369      std::string opId; //!< The identifier of the field 
    370       boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
    371       boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
    372       boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
     370      std::unique_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied 
     371      std::unique_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied 
     372      std::unique_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied 
    373373  }; 
    374374 

  • XIOS3/trunk/src/parse_expr/scalar_expr_node.hpp

    r1158 r2629  
    33 
    44#include <string> 
    5 #include <boost/smart_ptr/scoped_ptr.hpp> 
     5#include <memory> 
    66 
    77namespace xios 
    … …  
    8181    private: 
    8282      std::string opId; //!< The identifier of the field 
    83       boost::scoped_ptr<IScalarExprNode> child; //!< The scalar child node to which the operator is applied 
     83      std::unique_ptr<IScalarExprNode> child; //!< The scalar child node to which the operator is applied 
    8484  }; 
    8585 
    … …  
    105105    private: 
    106106      std::string opId; //!< The identifier of the field 
    107       boost::scoped_ptr<IScalarExprNode> child1, child2; //!< The scalar child nodes to which the operator is applied 
     107      std::unique_ptr<IScalarExprNode> child1, child2; //!< The scalar child nodes to which the operator is applied 
    108108  }; 
    109109 
    … …  
    126126    private: 
    127127      std::string opId; //!< The identifier of the field 
    128       boost::scoped_ptr<IScalarExprNode> child1, child2, child3; //!< The scalar child nodes to which the operator is applied 
     128      std::unique_ptr<IScalarExprNode> child1, child2, child3; //!< The scalar child nodes to which the operator is applied 
    129129  }; 
    130130} 

  • XIOS3/trunk/src/registry.hpp

    r2209 r2629  
    88 
    99// Those two headers can be replaced by the C++11 equivalent in the future 
    10 #include <boost/utility/enable_if.hpp> 
    11 #include <boost/type_traits.hpp> 
    1210 
    1311namespace xios 
    … …  
    3331 
    3432/** insert a value associated to a key*/ 
    35       template<typename T> typename boost::enable_if_c<!boost::is_convertible<T&, CBaseType&>::value>::type 
     33      template<typename T> typename std::enable_if<!std::is_convertible<T&, CBaseType&>::value>::type 
    3634      setKey(const std::string& key, const T& value) { this->setKey_(key,CType<T>(value)); } 
    3735 
    … …  
    4139 
    4240/** retrieve a value from a key */ 
    43       template<typename T> typename boost::enable_if_c<!boost::is_convertible<T&, CBaseType&>::value>::type 
     41      template<typename T> typename std::enable_if<!std::is_convertible<T&, CBaseType&>::value>::type 
    4442      getKey(const std::string& key, T& value) const { CType_ref<T> valRef(value); this->getKey_(key,valRef); } 
    4543 

  • XIOS3/trunk/src/server.cpp

    r2628 r2629  
    88#include "object_template.hpp" 
    99#include "oasis_cinterface.hpp" 
    10 #include <boost/functional/hash.hpp> 
    11 #include <boost/algorithm/string.hpp> 
    1210#include "mpi.hpp" 
    1311#include "tracer.hpp" 
    … …  
    562560       if (eventSent) 
    563561       { 
    564          boost::hash<string> hashString; 
     562         std::hash<string> hashString; 
    565563         size_t hashId = hashString("oasis_enddef"); 
    566564 
    … …  
    579577       { 
    580578           MPI_Recv(&msg,1,MPI_INT,root,5,intraComm_,&status) ; // tags oasis_endded = 5 
    581            boost::hash<string> hashString; 
     579           std::hash<string> hashString; 
    582580           size_t hashId = hashString("oasis_enddef"); 
    583581           CXios::getPoolRessource()->getEventScheduler()->registerEvent(0,hashId); 

  • XIOS3/trunk/src/test/test.cpp

    r501 r2629  
    33#include <string> 
    44 
    5 #include <boost/date_time/gregorian/gregorian.hpp> 
    6 #include <boost/date_time/posix_time/posix_time.hpp> 
    75#include "calendar_type.hpp" 
    86#include "date.hpp" 
    … …  
    2119 
    2220using namespace std ; 
    23 using namespace boost::posix_time ; 
    24 using namespace boost::gregorian ; 
    2521using namespace xios; 
    2622using namespace blitz; 

  • XIOS3/trunk/src/transport/context_client.cpp

    r2556 r2629  
    1313#include "server.hpp" 
    1414#include "services.hpp" 
    15 #include <boost/functional/hash.hpp> 
    1615#include <random> 
    1716#include <chrono> 

  • XIOS3/trunk/src/transport/context_client.cpp.old

    r2343 r2629  
    1313#include "server.hpp" 
    1414#include "services.hpp" 
    15 #include <boost/functional/hash.hpp> 
    1615#include <random> 
    1716#include <chrono> 

  • XIOS3/trunk/src/transport/context_server.cpp

    r2556 r2629  
    2727 
    2828 
    29 #include <boost/functional/hash.hpp> 
    3029#include <random> 
    3130#include <chrono> 

  • XIOS3/trunk/src/transport/legacy_context_client.cpp

    r2628 r2629  
    1414#include "services.hpp" 
    1515#include "ressources_manager.hpp" 
    16 #include <boost/functional/hash.hpp> 
    1716#include <random> 
    1817#include <chrono> 

  • XIOS3/trunk/src/transport/legacy_context_server.cpp

    r2628 r2629  
    2222#include "timeline_events.hpp" 
    2323 
    24 #include <boost/functional/hash.hpp> 
    2524#include <random> 
    2625#include <chrono> 

  • XIOS3/trunk/src/transport/one_sided_context_client.cpp

    r2592 r2629  
    1212#include "server.hpp" 
    1313#include "services.hpp" 
    14 #include <boost/functional/hash.hpp> 
    1514#include <random> 
    1615#include <chrono> 

  • XIOS3/trunk/src/transport/one_sided_context_server.cpp

    r2628 r2629  
    2222#include "timeline_events.hpp" 
    2323 
    24 #include <boost/functional/hash.hpp> 
    2524#include <random> 
    2625#include <chrono> 

  • XIOS3/trunk/src/transport/p2p_context_client.cpp

    r2589 r2629  
    1212#include "server.hpp" 
    1313#include "services.hpp" 
    14 #include <boost/functional/hash.hpp> 
    1514#include <random> 
    1615#include <chrono> 

  • XIOS3/trunk/src/transport/p2p_context_server.cpp

    r2628 r2629  
    2222#include "timeline_events.hpp" 
    2323 
    24 #include <boost/functional/hash.hpp> 
    2524#include <random> 
    2625#include <chrono> 

  • XIOS3/trunk/src/type/enum_impl.hpp

    r1158 r2629  
    88#include "message.hpp" 
    99#include <string> 
    10 #include <boost/algorithm/string.hpp> 
     10#include <boost_extract.hpp> 
    1111 
    1212namespace xios 
    … …  
    138138  void CEnum<T>::_fromString(const string& str) 
    139139  { 
    140     string tmpStr=boost::to_lower_copy(boost::trim_copy(str)) ; 
     140    string tmpStr=xios_to_lower_copy(xios_trim_copy(str)) ; 
    141141     
    142142    bool found=false ; 
    143143    for(int i=0;i<T::getSize();i++) 
    144144    { 
    145       if (boost::to_lower_copy(string(T::getStr()[i]))==tmpStr) 
     145      if (xios_to_lower_copy(string(T::getStr()[i]))==tmpStr) 
    146146      { 
    147147        allocate() ; 
    … …  
    155155    { 
    156156      if (i>0) strList<<", " ; 
    157       strList<<boost::to_lower_copy(string(T::getStr()[i])) ; 
     157      strList<<xios_to_lower_copy(string(T::getStr()[i])) ; 
    158158    } 
    159159     

  • XIOS3/trunk/src/type/enum_ref_impl.hpp

    r1158 r2629  
    88#include "message.hpp" 
    99#include <string> 
    10 #include <boost/algorithm/string.hpp> 
    1110 
    1211namespace xios 
    … …  
    140139  { 
    141140    checkEmpty() ; 
    142     string tmpStr=boost::to_lower_copy(boost::trim_copy(str)) ; 
     141    string tmpStr=xios_to_lower_copy(xios_trim_copy(str)) ; 
    143142     
    144143    bool found=false ; 
    145144    for(int i=0;i<T::getSize();i++) 
    146145    { 
    147       if (boost::to_lower_copy(string(T::getStr()[i]))==tmpStr) 
     146      if (xios_to_lower_copy(string(T::getStr()[i]))==tmpStr) 
    148147      { 
    149148        *ptrValue=(T_enum) i ; 
    … …  
    156155    { 
    157156      if (i>0) strList<<", " ; 
    158       strList<<boost::to_lower_copy(string(T::getStr()[i])) ; 
     157      strList<<xios_to_lower_copy(string(T::getStr()[i])) ; 
    159158    } 
    160159     

  • XIOS3/trunk/src/type/type_specialisation.hpp

    r591 r2629  
    88#include "type.hpp" 
    99#include <string> 
    10 #include <boost/algorithm/string.hpp> 
    1110#include "date.hpp" 
     11#include <boost_extract.hpp> 
    1212  
    1313namespace xios 
    … …  
    1818  template <> void CType<bool>::_fromString(const string& str) 
    1919  { 
    20     string tmpStr=boost::to_lower_copy(boost::trim_copy(str)) ; 
     20    string tmpStr=xios_to_lower_copy(xios_trim_copy(str)) ; 
    2121    if (tmpStr=="true" || tmpStr==".true." || tmpStr=="yes" || tmpStr=="y") set(true) ; 
    2222    else if (tmpStr=="false" || tmpStr==".false." || tmpStr=="no" || tmpStr=="n") set(false) ; 
    … …  
    3232  template <> void CType_ref<bool>::_fromString(const string& str) const 
    3333  { 
    34     string tmpStr=boost::to_lower_copy(boost::trim_copy(str)) ; 
     34    string tmpStr=xios_to_lower_copy(xios_trim_copy(str)) ; 
    3535    if (tmpStr=="true" || tmpStr==".true." || tmpStr=="yes" || tmpStr=="y") set(true) ; 
    3636    else if (tmpStr=="false" || tmpStr==".false." || tmpStr=="no" || tmpStr=="n") set(false) ; 
    … …  
    4040  template <> void CType_ref<bool>::_fromString(const string& str) 
    4141  { 
    42     string tmpStr=boost::to_lower_copy(boost::trim_copy(str)) ; 
     42    string tmpStr=xios_to_lower_copy(xios_trim_copy(str)) ; 
    4343    if (tmpStr=="true" || tmpStr==".true." || tmpStr=="yes" || tmpStr=="y") set(true) ; 
    4444    else if (tmpStr=="false" || tmpStr==".false." || tmpStr=="no" || tmpStr=="n") set(false) ; 
    … …  
    426426 
    427427 
    428 /* 
    429 template<size_t numDim> 
    430 boost::detail::multi_array::extent_gen<numDim> getExtentNull(void) { return getExtentNull<numDim-1>()[0];} 
    431  
    432 template<> 
    433 boost::detail::multi_array::extent_gen<1> getExtentNull<1>(void) { return extents[0]; } 
    434 */ 
    435428/* 
    436429#define CTYPE_ARRAY(ValueType,NumsDims)                                \ 

  • XIOS3/trunk/src/utils.hpp

    r2177 r2629  
    185185      return hash; 
    186186    } 
    187  
     187     
    188188    static inline size_t hash_combine(size_t seed, const T& value) 
    189189    { 
    … …  
    193193 
    194194  }; 
     195   
     196  struct pair_xios_hash { 
     197    template <class T> 
     198    std::size_t operator () (const std::pair<T,T> &p) const 
     199    { 
     200      const std::vector<T> hash_vec = {p.first, p.second}; 
     201      return HashAlgorithm<T>::boost_hash(hash_vec ); 
     202    } 
     203  }; 
     204 
    195205 
    196206  template<typename T, typename Algo = Int2Type<0> > 

  • XIOS3/trunk/src/uuid.cpp

    r1174 r2629  
    1 #include <boost/uuid/uuid.hpp> 
    2 #include <boost/uuid/uuid_generators.hpp> 
    3 #include <boost/uuid/uuid_io.hpp> 
     1#include <string> 
     2#include <boost_uuid.hpp> 
    43 
    54namespace xios 
    … …  
    87  std::string getUuidStr(void) 
    98  { 
    10     boost::uuids::random_generator gen; 
    11     boost::uuids::uuid u = gen(); 
    12     return boost::uuids::to_string(u) ; 
     9    boost_uuid uuid = gen_boost_uuid(); 
     10    return to_string(uuid) ; 
    1311  } 
    1412   

  • XIOS3/trunk/src/xios_spl.hpp

    r1984 r2629  
    3737 
    3838/// boost headers /// 
    39 #include <boost/cast.hpp> 
    40 #include <boost/current_function.hpp> 
    4139 
    4240/// Map /// 
    … …  
    6967#include "log.hpp" 
    7068using namespace std; 
    71 //using namespace boost ; 
    7269 
    7370#endif //__XIOS_SPL__ 

  • XIOS3/trunk/src/xml_node.cpp

    r1367 r2629  
    11#include "xml_node.hpp" 
    2 #include <boost/algorithm/string.hpp> 
     2#include <boost_extract.hpp> 
    33 
    44namespace xios 
    … …  
    8787             nextElement = nextElement->next_sibling();  
    8888         } 
    89          boost::algorithm::replace_all(content,"\n"," ") ; 
    90          boost::algorithm::trim(content) ; 
     89         xios_replace_all(content,"\n"," ") ; 
     90         content = xios_trim_copy(content);  
    9191         if (content.size()==0) return false ; 
    9292         else return true ; 
Note: See TracChangeset for help on using the changeset viewer.