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

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

Location:
XIOS3/trunk/src/parse_expr
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • 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} 
Note: See TracChangeset for help on using the changeset viewer.