выпиливание boost'a

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52971 954022d7-b5bf-4e40-9824-e11837661b57

Common/ASCDocxFormat/Source/XML/Private/XElementContainer.cpp

@@ -133,22 +133,22 @@ namespace XML
 
 		XElementContainer::iterator XElementContainer:: begin()
 		{
-			return iterator(m_container->begin(), m_container->end());
+			return m_container->begin();
 		}
 
 		XElementContainer::iterator XElementContainer::end()
 		{
-			return iterator(m_container->end(), m_container->end());
+			return m_container->end();
 		}
 
 		XElementContainer::const_iterator XElementContainer::begin() const
 		{
-			return const_iterator(m_container->begin(), m_container->end());
+			return m_container->begin();
 		}
 
 		XElementContainer::const_iterator XElementContainer::end() const
 		{
-			return const_iterator(m_container->end(), m_container->end());
+			return m_container->end();
 		}
 
 		const XNamespaceContainer XElementContainer::usedNamespace() const

Common/ASCDocxFormat/Source/XML/Private/XElementContainer.h

@@ -3,7 +3,6 @@
 #define XML_PRIVATE_XELEMENT_CONTAINER_INCLUDE_H_
 
 #include <list>
-#include <boost/iterator/filter_iterator.hpp>
 
 #include "Filter/Element.h"
 #include "XNamespaceContainer.h"
@@ -32,8 +31,9 @@ namespace XML
 			void Add(const XElement& element);
 
 		public:
-			typedef boost::filter_iterator<Filter::Element, std::list<XNode>::iterator> iterator;
-			typedef boost::filter_iterator<Filter::Element, std::list<XNode>::const_iterator> const_iterator;
+		
+			typedef std::list<XNode>::iterator iterator;
+			typedef std::list<XNode>::const_iterator const_iterator;
 
 		public:
 			XElementContainer const* const	operator->() const	{return this;}

Common/ASCDocxFormat/Source/XML/Private/XTextContainer.cpp

@@ -53,22 +53,22 @@ namespace XML
 
 		XTextContainer::iterator XTextContainer:: begin()
 		{
-			return iterator(m_container->begin(), m_container->end());
+			return m_container->begin();
 		}
 
 		XTextContainer::iterator XTextContainer::end()
 		{
-			return iterator(m_container->end(), m_container->end());
+			return m_container->end();
 		}
 
 		XTextContainer::const_iterator XTextContainer::begin() const
 		{
-			return const_iterator(m_container->begin(), m_container->end());
+			return m_container->begin();
 		}
 
 		XTextContainer::const_iterator XTextContainer::end() const
 		{
-			return const_iterator(m_container->end(), m_container->end());
+			return m_container->end();
 		}
 
 	} // namespace Private

Common/ASCDocxFormat/Source/XML/Private/XTextContainer.h

@@ -4,7 +4,7 @@
 
 #include <vector>
 #include <list>
-#include <boost/iterator/filter_iterator.hpp>
+
 #include "Filter/Text.h"
 #include "XString.h"
 
@@ -30,8 +30,9 @@ namespace XML
 			const XString text() const;
 
 		public:
-			typedef boost::filter_iterator<Filter::Text, std::list<XNode>::iterator> iterator;
-			typedef boost::filter_iterator<Filter::Text, std::list<XNode>::const_iterator> const_iterator;
+		
+			typedef std::list<XNode>::iterator iterator;
+			typedef std::list<XNode>::const_iterator const_iterator;
 
 		public:
 			XTextContainer const* const	operator->() const	{return this;}