Commit 4b820c2c authored by Pavel Vainerman's avatar Pavel Vainerman Committed by Pavel Vainerman

(build): fixed deprecated iterator definition

parent 74b48077
...@@ -90,15 +90,15 @@ namespace uniset ...@@ -90,15 +90,15 @@ namespace uniset
std::unordered_map<std::string, int> colname; std::unordered_map<std::string, int> colname;
}; };
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
class DBRowIterator: class DBRowIterator
public std::iterator<std::bidirectional_iterator_tag,
DBResult::ROW::value_type,
DBResult::ROW::difference_type,
DBResult::ROW::pointer,
DBResult::ROW::reference>
{ {
public: public:
using iterator_category = std::bidirectional_iterator_tag;
using value_type = DBResult::ROW::value_type;
using difference_type = DBResult::ROW::difference_type;
using pointer = DBResult::ROW::pointer;
using reference = DBResult::ROW::reference;
std::string as_string( const char* name ) const; std::string as_string( const char* name ) const;
std::string as_string( const std::string& name ) const; std::string as_string( const std::string& name ) const;
......
...@@ -40,10 +40,15 @@ namespace uniset ...@@ -40,10 +40,15 @@ namespace uniset
{ {
typedef std::vector< std::pair<const std::string, const std::string> > UniXMLPropList; typedef std::vector< std::pair<const std::string, const std::string> > UniXMLPropList;
class UniXML_iterator: class UniXML_iterator
public std::iterator<std::bidirectional_iterator_tag, xmlNode, ptrdiff_t, xmlNode*, xmlNode&>
{ {
public: public:
using iterator_category = std::bidirectional_iterator_tag;
using value_type = xmlNode;
using difference_type = ptrdiff_t;
using pointer = const value_type*;
using reference = const value_type&;
UniXML_iterator(xmlNode* node) noexcept: UniXML_iterator(xmlNode* node) noexcept:
curNode(node) curNode(node)
{} {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment