Changeset 2629 for XIOS3/trunk/src/parse_expr
- Timestamp:
- 04/25/24 15:05:23 (2 months ago)
- Location:
- XIOS3/trunk/src/parse_expr
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS3/trunk/src/parse_expr/filter_expr_node.cpp
r2194 r2629 45 45 46 46 } 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", 48 48 << "The field " << id << " does not exist."); 49 49 } -
XIOS3/trunk/src/parse_expr/filter_expr_node.hpp
r1542 r2629 3 3 4 4 #include <string> 5 #include < boost/smart_ptr/scoped_ptr.hpp>5 #include <memory> 6 6 #include "scalar_expr_node.hpp" 7 7 … … 90 90 private: 91 91 std::string opId; //!< The identifier of the field 92 boost::scoped_ptr<IFilterExprNode> child; //!< The child node to which the operator is applied92 std::unique_ptr<IFilterExprNode> child; //!< The child node to which the operator is applied 93 93 }; 94 94 … … 115 115 private: 116 116 std::string opId; //!< The identifier of the field 117 boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied118 boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied117 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 119 119 }; 120 120 … … 141 141 private: 142 142 std::string opId; //!< The identifier of the field 143 boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied144 boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied143 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 145 145 }; 146 146 … … 166 166 private: 167 167 std::string opId; //!< The identifier of the field 168 boost::scoped_ptr<IFilterExprNode> child1, child2; //!< The field child nodes to which the operator is applied168 std::unique_ptr<IFilterExprNode> child1, child2; //!< The field child nodes to which the operator is applied 169 169 }; 170 170 … … 194 194 private: 195 195 std::string opId; //!< The identifier of the field 196 boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied197 boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied198 boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied196 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 199 199 }; 200 200 … … 223 223 private: 224 224 std::string opId; //!< The identifier of the field 225 boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied226 boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied227 boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied225 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 228 228 }; 229 229 … … 252 252 private: 253 253 std::string opId; //!< The identifier of the field 254 boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied255 boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied256 boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied254 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 257 257 }; 258 258 … … 282 282 private: 283 283 std::string opId; //!< The identifier of the field 284 boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied285 boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied286 boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied284 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 287 287 }; 288 288 … … 311 311 private: 312 312 std::string opId; //!< The identifier of the field 313 boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied314 boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied315 boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied313 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 316 316 }; 317 317 … … 339 339 private: 340 340 std::string opId; //!< The identifier of the field 341 boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied342 boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied343 boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied341 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 344 344 }; 345 345 … … 368 368 private: 369 369 std::string opId; //!< The identifier of the field 370 boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied371 boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied372 boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied370 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 373 373 }; 374 374 -
XIOS3/trunk/src/parse_expr/scalar_expr_node.hpp
r1158 r2629 3 3 4 4 #include <string> 5 #include < boost/smart_ptr/scoped_ptr.hpp>5 #include <memory> 6 6 7 7 namespace xios … … 81 81 private: 82 82 std::string opId; //!< The identifier of the field 83 boost::scoped_ptr<IScalarExprNode> child; //!< The scalar child node to which the operator is applied83 std::unique_ptr<IScalarExprNode> child; //!< The scalar child node to which the operator is applied 84 84 }; 85 85 … … 105 105 private: 106 106 std::string opId; //!< The identifier of the field 107 boost::scoped_ptr<IScalarExprNode> child1, child2; //!< The scalar child nodes to which the operator is applied107 std::unique_ptr<IScalarExprNode> child1, child2; //!< The scalar child nodes to which the operator is applied 108 108 }; 109 109 … … 126 126 private: 127 127 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 applied128 std::unique_ptr<IScalarExprNode> child1, child2, child3; //!< The scalar child nodes to which the operator is applied 129 129 }; 130 130 }
Note: See TracChangeset
for help on using the changeset viewer.