From 1c764373095f05b0fce228f09d1d7091ca8fba09 Mon Sep 17 00:00:00 2001
From: Myun2 <myun2@nwhite.info>
Date: Thu, 30 Sep 2010 01:25:32 +0900
Subject: [PATCH] =?utf8?q?sax.hpp:=20operator=20<<=20()=E3=81=AE=E5=BC=95?=
 =?utf8?q?=E6=95=B0=E3=81=8C=20roast::=5Flinear=5Fiterator=5Farithmetic<ro?=
 =?utf8?q?ast::ccharbuf=5Fiterator>=20=E3=81=A8=E3=81=8B=E3=81=AA=E3=81=A3?=
 =?utf8?q?=E3=81=A6=E3=81=9F=E3=81=91=E3=81=A9=E3=80=81=E3=82=82=E3=81=86?=
 =?utf8?q?=E3=81=93=E3=82=8C=E5=8D=98=E3=81=AA=E3=82=8B=E3=82=A4=E3=83=86?=
 =?utf8?q?=E3=83=AC=E3=83=BC=E3=82=BF=E3=81=A7=E3=82=88=E3=81=8F=E3=81=AD?=
 =?utf8?q?=EF=BC=9F=E3=81=BF=E3=81=9F=E3=81=84=E3=81=AA=E3=80=82,=20sax=5F?=
 =?utf8?q?parser=E3=80=80=E3=82=82=E3=80=80string=5Fparser=5Fbase=E3=80=80?=
 =?utf8?q?=E3=82=92=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84=E3=81=A7=E5=8D=98?=
 =?utf8?q?=E3=81=AB=E3=83=AB=E3=83=BC=E3=83=AB=E3=82=92=E3=81=9D=E3=81=AE?=
 =?utf8?q?=E3=81=BE=E3=81=BE=E4=BD=BF=E3=81=86=E4=BA=8B=E3=81=AB=E3=81=97?=
 =?utf8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 roast/include/roast/xml/roast_xml/sax.hpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/roast/include/roast/xml/roast_xml/sax.hpp b/roast/include/roast/xml/roast_xml/sax.hpp
index 2d081d28..e8633c17 100644
--- a/roast/include/roast/xml/roast_xml/sax.hpp
+++ b/roast/include/roast/xml/roast_xml/sax.hpp
@@ -6,7 +6,6 @@
 #define __SFJP_ROAST__xml__roast_xml__sax_HPP__
 
 #include "roast/xml/roast_xml/rule_xml.hpp"
-#include "roast/lexical/string_parser_base.hpp"
 
 namespace roast
 {
@@ -24,12 +23,13 @@ namespace roast
 		public:
 			sax_parser_impl(){ m_code = rule::pcode::_null; }
 
-			void operator << ( ::std::pair<
-				roast::_linear_iterator_arithmetic<roast::ccharbuf_iterator>,
-				roast::_linear_iterator_arithmetic<roast::ccharbuf_iterator> > &p)
+			template <typename _It>
+			void operator << ( const ::std::pair<_It, _It> &p )
 			{
-				sized_ptr_<const char> str(&*p.first, p.second - p.first);
-				sized_ccharbuf cb(str.ptr, str.size);
+				/*sized_ptr_<const char> str(&*p.first, p.second - p.first);
+				sized_ccharbuf cb(str.ptr, str.size);*/ //	<-- ???
+
+				sized_ccharbuf cb(&*p.first, p.second - p.first);
 				//printf( cb.to_string().c_str() );
 
 				//using namespace rule::pcode;
@@ -90,7 +90,7 @@ namespace roast
 
 		////////////////////////////////////////////////////////////////
 
-		template <typename _SaxCallback>
+		/*template <typename _SaxCallback>
 		class sax_parser : public lexical::string_parser_base<sax_parser_impl<_SaxCallback> >
 		{
 		private:
@@ -98,7 +98,8 @@ namespace roast
 		public:
 			sax_parser(){}
 			sax_parser(const char* s) : _Base(s) {}
-		};
+		};*/
+		typedef _rule sax, sax_parser;
 
 		//////////////////////////////////////////////////////////////////////////////////////////
 	}
-- 
2.11.0