だいぶ直し中

diff --git a/roast/include/roast/lexical/rule/string.hpp b/roast/include/roast/lexical/rule/string.hpp
index 2ff7c2f..25b9fc7 100644 (file)
--- a/roast/include/roast/lexical/rule/string.hpp
+++ b/roast/include/roast/lexical/rule/string.hpp
@@ -49,6 +49,8 @@ namespace roast
                                        return true;
                                }
                                
+                               operator ::std::string() { return m_str; }
+                               operator const ::std::string() const { return m_str; }
                                operator const char*() const { return m_str.c_str(); }
                        };
                        /////

diff --git a/roast/include/roast/net/uri.hpp b/roast/include/roast/net/uri.hpp
index 8e00d04..6779be2 100644 (file)
--- a/roast/include/roast/net/uri.hpp
+++ b/roast/include/roast/net/uri.hpp
@@ -118,14 +118,14 @@ namespace roast
                                uri_authority_rule<_Host, _UserInfo> r;
                                _nest_type::ref<0>(r, _nest_type::_get_n<0>()) = user;
                                _nest_type::ref<2>(r, _nest_type::_get_n<2>()) = host;
-                               return r.generate(strm, doc);
+                               return r.generate(strm, r);
                        }
 
                        else if ( user == "" ){
                                uri_authority_rule<_Host, EmptyType, _Port> r;
                                _nest_type::ref<0>(r, _nest_type::_get_n<0>()) = host;
                                _nest_type::ref<2>(r, _nest_type::_get_n<2>()) = port_no;
-                               return r.generate(strm, doc);
+                               return r.generate(strm, r);
                        }
 
                        else {
@@ -133,7 +133,7 @@ namespace roast
                                _nest_type::ref<0>(r, _nest_type::_get_n<0>()) = user;
                                _nest_type::ref<2>(r, _nest_type::_get_n<2>()) = host;
                                _nest_type::ref<4>(r, _nest_type::_get_n<4>()) = port_no;
-                               return r.generate(strm, doc);
+                               return r.generate(strm, r);
                        }
                }
        };