diff options
Diffstat (limited to 'project2/xml/xpathRows.h')
| -rw-r--r-- | project2/xml/xpathRows.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/project2/xml/xpathRows.h b/project2/xml/xpathRows.h index 663df89..9066261 100644 --- a/project2/xml/xpathRows.h +++ b/project2/xml/xpathRows.h @@ -3,7 +3,6 @@ #include <libxml++/nodes/element.h> #include <libxml/tree.h> -#include <boost/intrusive_ptr.hpp> #include <map> #include "rowSet.h" #include "variables.h" @@ -23,10 +22,10 @@ class DLL_PUBLIC XPathRows : public RowSet, XmlDocumentCache { class FilterViewColumn : public Column { public: FilterViewColumn(unsigned int, ScriptNodePtr); - static FilterViewColumn * make(unsigned int, ScriptNodePtr); + static std::shared_ptr<Column> make(unsigned int, ScriptNodePtr); const Variable path; }; - class FilterView : public DefinedColumns, public virtual IntrusivePtrBase { + class FilterView : public DefinedColumns { public: typedef std::map<const Glib::ustring, Variable> XPaths; @@ -35,8 +34,8 @@ class DLL_PUBLIC XPathRows : public RowSet, XmlDocumentCache { const Glib::ustring name; const Variable root; }; - typedef boost::intrusive_ptr<FilterView> FilterViewPtr; - typedef boost::intrusive_ptr<const FilterView> FilterViewCPtr; + typedef std::shared_ptr<FilterView> FilterViewPtr; + typedef std::shared_ptr<const FilterView> FilterViewCPtr; typedef std::map<const Glib::ustring, FilterViewPtr> FilterViews; FilterViews fvs; |