From d3ed9fd1524f2ef8028b6769e568df9656d75ef1 Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Sat, 18 Sep 2010 04:22:22 +0900
Subject: [PATCH] =?utf8?q?condition=5Fend=5Fiterator.hpp:=20=E3=81=AA?=
 =?utf8?q?=E3=82=93=E3=81=A7=E3=81=93=E3=82=93=E3=81=AA=E4=BA=8B=E3=81=AB?=
 =?utf8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F?=
 =?utf8?q?=E3=81=84=E3=81=9F=E3=82=93=E3=81=A0=E3=82=8D=E3=81=86=E3=83=BB?=
 =?utf8?q?=E3=83=BB=E3=83=BB=E3=81=9D=E3=81=97=E3=81=A6=E3=81=93=E3=82=8C?=
 =?utf8?q?=E3=81=A7=E6=AD=A3=E3=81=97=E3=81=84=E3=81=AE=E3=81=A0=E3=82=8D?=
 =?utf8?q?=E3=81=86=E3=81=8B=E3=83=BB=E3=83=BB=E3=83=BB=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../roast/container/condition_end_iterator.hpp     | 54 ----------------------
 1 file changed, 54 deletions(-)

diff --git a/roast/include/roast/container/condition_end_iterator.hpp b/roast/include/roast/container/condition_end_iterator.hpp
index b0d672e0..b292ad3a 100644
--- a/roast/include/roast/container/condition_end_iterator.hpp
+++ b/roast/include/roast/container/condition_end_iterator.hpp
@@ -12,50 +12,6 @@ namespace roast
 {
 	/////////////////////////////////////////////////////////
 
-<<<<<<< HEAD
-	template <typename T, typename _Iterator, typename _ConditionProc>
-	class _condition_end_iterator_impl
-	{
-	public:
-		typedef _Iterator _IteratorType;
-		typedef T _T, _Ty, _Value, _ValueType, ValueType;
-	private:
-		_Iterator m_it;
-
-	public:
-		_condition_end_iterator_impl(){}
-		_condition_end_iterator_impl(const _Iterator& _beg)
-			: m_it(_beg)
-			{}
-		///////////////////////////////////////////////////////////////////////
-		
-		void setup(const _Iterator& _beg)
-		{
-			m_it = _beg;
-		}
-		
-		int compare(const _condition_end_iterator_impl& target) const 
-		{
-			return m_it - target.m_it;
-		}
-		
-		//	Next (Like iterator ++)
-		void next() {
-			m_it++;
-		}
-		
-		//	Iterator pointer Valid?
-		bool is_valid() {
-			_ConditionProc cp;
-			return cp(*m_it);
-		}
-
-		//	Value
-		_ValueType& get_value_ref() const
-		{
-			return *m_it;
-		}
-=======
 	template <typename _BaseImpl, typename _ConditionProc>
 	class _condition_end_iterator_impl :
 		public _BaseImpl
@@ -75,19 +31,10 @@ namespace roast
 			_ConditionProc cp;
 			return cp(*m_it);
 		}
->>>>>>> remotes/origin/master2
 	};
 	
 	/////////////////////////////////////////////////////////
 
-<<<<<<< HEAD
-	template <typename T, typename _Iterator, typename _ConditionProc>
-	class condition_end_iterator :
-		public _iterator< _condition_end_iterator_impl<T,_Iterator,_ConditionProc> >
-	{
-	private:
-		typedef _condition_end_iterator_impl<T,_Iterator,_ConditionProc> _Impl;
-=======
 	template <typename _BaseImpl, typename _ConditionProc>
 	class condition_end_iterator :
 		public _iterator< _condition_end_iterator_impl<_BaseImpl, _ConditionProc> >
@@ -95,7 +42,6 @@ namespace roast
 	private:
 		typedef _condition_end_iterator_impl<_BaseImpl, _ConditionProc> _Impl;
 		typedef typename _BaseImpl::_IteratorType _Iterator, _IteratorType;
->>>>>>> remotes/origin/master2
 		typedef _iterator<_Impl> _Base;
 	public:
 		condition_end_iterator(){}
-- 
2.11.0