Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2024-12-26 21:58:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XPathExpressionPtr no longer derives from boost::shared_ptr, it contains it instead

Browse source
This commit is contained in:
jez 2007-10-22 20:25:35 +00:00
parent f6b2ed4966
commit fac7cf88de
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/XPath/xgrep.cpp
View file

@ -1,6 +1,3 @@
// DOMWriter.cpp : Defines the entry point for the application.
//
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable: 4786 4250 4503) #pragma warning(disable: 4786 4250 4503)
#endif #endif

22
include/XPath/impl/xpath_expression.hpp
View file

@ -51,20 +51,26 @@ private:
}; // class XPathExpression }; // class XPathExpression
template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> > template<class string_type, class string_adaptor = Arabica::default_string_adaptor<string_type> >
class XPathExpressionPtr : public boost::shared_ptr<XPathExpression<string_type, string_adaptor> > class XPathExpressionPtr
{ {
public: public:
XPathExpressionPtr() : XPathExpressionPtr() : ptr_() { }
boost::shared_ptr<XPathExpression<string_type, string_adaptor> >() { } explicit XPathExpressionPtr(XPathExpression<string_type, string_adaptor>* xp) : ptr_(xp) { }
explicit XPathExpressionPtr(XPathExpression<string_type, string_adaptor>* xp) : XPathExpressionPtr(const XPathExpressionPtr& rhs) : ptr_(rhs.ptr_) { }
boost::shared_ptr<XPathExpression<string_type, string_adaptor> >(xp) { }
XPathExpressionPtr(const XPathExpressionPtr& rhs) :
boost::shared_ptr<XPathExpression<string_type, string_adaptor> >(rhs) { }
XPathExpressionPtr& operator=(const XPathExpressionPtr& rhs) XPathExpressionPtr& operator=(const XPathExpressionPtr& rhs)
{ {
boost::shared_ptr<XPathExpression<string_type, string_adaptor> >::operator=(rhs); ptr_ = rhs.ptr_;
return *this; return *this;
} // operator= } // operator=
const XPathExpression<string_type, string_adaptor>* get() const { return ptr_.get(); }
const XPathExpression<string_type, string_adaptor>* operator->() const { return ptr_.get(); }
operator bool() const { return ptr_.get(); }
private:
typedef boost::shared_ptr<const XPathExpression<string_type, string_adaptor> > ExpressionPtr;
ExpressionPtr ptr_;
}; // class XPathExpressionPtr }; // class XPathExpressionPtr
namespace impl namespace impl

2
include/XPath/impl/xpath_parser.hpp
View file

@ -82,7 +82,7 @@ public:
std::vector<MatchExpr<string_type, string_adaptor> > compile_match(const string_type& xpath) const std::vector<MatchExpr<string_type, string_adaptor> > compile_match(const string_type& xpath) const
{ {
XPathExpressionPtr<string_type, string_adaptor> wrapper = do_compile(xpath, &XPath::parse_xpath_match, match_factory()); XPathExpressionPtr<string_type, string_adaptor> wrapper = do_compile(xpath, &XPath::parse_xpath_match, match_factory());
return (static_cast<impl::MatchExpressionWrapper<string_type, string_adaptor>*>(wrapper.get()))->matches(); return (static_cast<const impl::MatchExpressionWrapper<string_type, string_adaptor>*>(wrapper.get()))->matches();
} // compile_match } // compile_match
XPathValue<string_type, string_adaptor> evaluate(const string_type& xpath, const DOM::Node<string_type, string_adaptor>& context) const XPathValue<string_type, string_adaptor> evaluate(const string_type& xpath, const DOM::Node<string_type, string_adaptor>& context) const

4
tests/XPath/arithmetic_test.hpp
View file

@ -26,13 +26,9 @@ public:
XPathExpression<string_type, string_adaptor>* p2 = new NumericValue<string_type, string_adaptor>(2); XPathExpression<string_type, string_adaptor>* p2 = new NumericValue<string_type, string_adaptor>(2);
XPathExpressionPtr<string_type, string_adaptor> add(new impl::PlusOperator<string_type, string_adaptor>(p1, p2)); XPathExpressionPtr<string_type, string_adaptor> add(new impl::PlusOperator<string_type, string_adaptor>(p1, p2));
assertEquals(1, add.use_count());
add->evaluate(dummy_); add->evaluate(dummy_);
assertEquals(3.0, add->evaluateAsNumber(dummy_), 0.0); assertEquals(3.0, add->evaluateAsNumber(dummy_), 0.0);
assertEquals(1, add.use_count());
} // test1 } // test1
void test2() void test2()