roast_xml関連でのcommit漏れがあったようで・・・

diff --git a/roast/include/roast/lexical/generator_base.hpp b/roast/include/roast/lexical/generator_base.hpp
index aacb5b4..586be0e 100644 (file)
--- a/roast/include/roast/lexical/generator_base.hpp
+++ b/roast/include/roast/lexical/generator_base.hpp
@@ -10,15 +10,16 @@ namespace roast
        {
                //////////////////////////////////////////////////////////
                
-               template <typename _Rule, typename _Document>
+               template <typename _Rule, typename _DocItr>
                class generator_base
                {
                public:
                        template <typename _Strm>
-                       bool generate(const _Document& doc, _Strm &strm)
+                       //bool generate(const _Document& doc, _Strm &strm)
+                       bool generate(_Strm &strm, _DocItr docitr)
                        {
                                _Rule rule;
-                               return rule.generate(strm, doc);
+                               return rule.generate(strm, docitr);
                        }
                };
                
@@ -26,4 +27,4 @@ namespace roast
        }
 }
 
-#endif//__SFJP_ROAST__lexical__generator_base_HPP__
\ No newline at end of file
+#endif//__SFJP_ROAST__lexical__generator_base_HPP__

diff --git a/roast/include/roast/xml/roast_xml/rule_xml.hpp b/roast/include/roast/xml/roast_xml/rule_xml.hpp
index 23f883e..58b5592 100644 (file)
--- a/roast/include/roast/xml/roast_xml/rule_xml.hpp
+++ b/roast/include/roast/xml/roast_xml/rule_xml.hpp
@@ -208,6 +208,12 @@ namespace roast
                                        element e;
                                        return e.analyze(it,param);
                                }
+                               template <typename _Strm, typename _Document>
+                               bool generate(_Strm& strm, _Document& doc)
+                               {
+                                       element e;
+                                       return e.generate(strm,doc);
+                               }
                        };
 
                        ////////////////////////////////////////////////////////////////////////////////////