Switch from int to long in status code exception path.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / XMLObjectChildrenList.h

diff --git a/xmltooling/util/XMLObjectChildrenList.h b/xmltooling/util/XMLObjectChildrenList.h
index 95f5c4c..c0b6575 100644 (file)
--- a/xmltooling/util/XMLObjectChildrenList.h
+++ b/xmltooling/util/XMLObjectChildrenList.h
@@ -89,7 +89,7 @@ namespace xmltooling {
     class XMLObjectChildrenIterator
     {
         /// @cond OFF
-        typename _Ty m_iter;
+        _Ty m_iter;
         template <class _Tx, class _Tz> friend class XMLObjectChildrenList;
         template <class _Tx, class _Tz> friend class XMLObjectPairList;
     public:
@@ -488,12 +488,12 @@ namespace xmltooling {
 
         const_iterator begin() const {
             // return iterator for beginning of const sequence
-            return m_container.begin();
+            return const_cast<const Container&>(m_container).begin();
         }
 
         const_iterator end() const {
             // return iterator for end of const sequence
-            return m_container.end();
+            return const_cast<const Container&>(m_container).end();
         }
 
         const_reference at(size_type _Pos) const {
@@ -642,12 +642,12 @@ namespace xmltooling {
 
         const_iterator begin() const {
             // return iterator for beginning of const sequence
-            return m_container.begin();
+            return const_cast<const Container&>(m_container).begin();
         }
 
         const_iterator end() const {
             // return iterator for end of const sequence
-            return m_container.end();
+            return const_cast<const Container&>(m_container).end();
         }
 
         const_reference at(size_type _Pos) const {