InputIterator と OutputStream

diff --git a/roast/include/roast/lexical2/empty_type.hpp b/roast/include/roast/lexical2/empty_type.hpp
index 39eb957..66c361b 100644 (file)
--- a/roast/include/roast/lexical2/empty_type.hpp
+++ b/roast/include/roast/lexical2/empty_type.hpp
@@ -15,14 +15,14 @@ namespace roast
                class empty_true : public zero_length
                {
                public:
-                       template <typename _It, typename _Param>
-                       bool analyze(const _It&, const _Param&) const 
+                       template <typename InputIterator, typename _Param>
+                       bool analyze(const InputIterator&, const _Param&) const 
                        {
                                return true;
                        }
                        /////
-                       template <typename _It, typename _Param>
-                       bool generate(const _It&, const _Param&) const 
+                       template <typename OutputStream, typename _Param>
+                       bool generate(const OutputStream&, const _Param&) const 
                        {
                                return true;
                        }
@@ -34,14 +34,14 @@ namespace roast
                class empty_false : public zero_length
                {
                public:
-                       template <typename _It, typename _Param>
-                       bool analyze(const _It&, const _Param&) const 
+                       template <typename InputIterator, typename _Param>
+                       bool analyze(const InputIterator&, const _Param&) const 
                        {
                                return false;
                        }
                        /////
-                       template <typename _It, typename _Param>
-                       bool generate(const _It&, const _Param&) const 
+                       template <typename OutputStream, typename _Param>
+                       bool generate(const OutputStream&, const _Param&) const 
                        {
                                return false;
                        }

diff --git a/roast/include/roast/lexical2/fixed.hpp b/roast/include/roast/lexical2/fixed.hpp
index f80e700..23955ea 100644 (file)
--- a/roast/include/roast/lexical2/fixed.hpp
+++ b/roast/include/roast/lexical2/fixed.hpp
@@ -24,8 +24,8 @@ namespace roast
                                
                                /////////////////
                                
-                               template <typename _It, typename _Param>
-                               bool analyze(_It& it, const _Param& param) const
+                               template <typename InputIterator, typename _Param>
+                               bool analyze(InputIterator& ii, const _Param& param) const
                                {
                                        bool ret = (*it == data);
                                        if ( ret )
@@ -35,10 +35,10 @@ namespace roast
 
                                //----
                                
-                               template <typename _Strm, typename _Document>
-                               void generate(_Strm& strm, const _Document& doc) const
+                               template <typename OutputStream, typename _Document>
+                               void generate(OutputStream& os, const _Document& doc) const
                                {
-                                       strm << data;
+                                       os << data;
                                }
                        };