From: Scott Cantor Date: Fri, 9 Nov 2007 04:14:10 +0000 (+0000) Subject: Multi-line svn commit, see body. X-Git-Tag: 1.0-beta2~24 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=b9571c1590fc6bcacc2c136904510a0793a1d3c6 Multi-line svn commit, see body. Added < operator for iterator class. Another attempt to get iterator nested types declared portably. --- diff --git a/xmltooling/util/XMLObjectChildrenList.h b/xmltooling/util/XMLObjectChildrenList.h index df6b860..f897df0 100644 --- a/xmltooling/util/XMLObjectChildrenList.h +++ b/xmltooling/util/XMLObjectChildrenList.h @@ -91,12 +91,13 @@ namespace xmltooling { template friend class XMLObjectChildrenList; template friend class XMLObjectPairList; public: - typedef typename _Ty::value_type value_type; - typedef typename _Ty::reference reference; - typedef typename _Ty::pointer pointer; + typedef typename std::iterator_traits::iterator_category iterator_category; + typedef typename std::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::difference_type difference_type; + typedef typename std::iterator_traits::pointer pointer; + typedef typename std::iterator_traits::reference reference; typedef typename _Ty::const_reference const_reference; typedef typename _Ty::const_pointer const_pointer; - typedef typename _Ty::difference_type difference_type; XMLObjectChildrenIterator() { } @@ -180,6 +181,10 @@ namespace xmltooling { // test for iterator inequality return (!(m_iter == _Right.m_iter)); } + + bool operator<(const XMLObjectChildrenIterator &_Right) const { + return (m_iter < _Right.m_iter); + } /// @endcond };