コミット漏れてる…

diff --git a/roast/include/roast/lexical/util.hpp b/roast/include/roast/lexical/util.hpp
index 26cd6a2..ce98f77 100644 (file)
--- a/roast/include/roast/lexical/util.hpp
+++ b/roast/include/roast/lexical/util.hpp
@@ -68,7 +68,7 @@ namespace roast
                ::std::string str_generate()
                {
                        ::std::string s;
-                       ::roast::string_stream ss(s);
+                       ::roast::string_output_stream ss(s);
                        rule::false_ret_to_exception<_Rule> r;
                        r.generate(ss, null_document);
                        return s;
@@ -83,7 +83,7 @@ namespace roast
                ::std::string str_generate(_Document& doc)
                {
                        ::std::string s;
-                       ::roast::string_stream ss(s);
+                       ::roast::string_output_stream ss(s);
                        rule::false_ret_to_exception<_Rule> r;
                        r.generate(ss,doc);
                        return s;
@@ -97,7 +97,7 @@ namespace roast
                template <typename _Rule, typename _Document>
                ::std::string to_string(_Rule& r, _Document& doc){
                        ::std::string s;
-                       ::roast::string_stream ss(s);
+                       ::roast::string_output_stream ss(s);
                        //if ( r.generate(ss,doc) == false )
                        r.generate(ss,doc);
                        return s;
@@ -112,7 +112,7 @@ namespace roast
                ::std::string to_string2(_Rule& r)
                {
                        ::std::string s;
-                       ::roast::string_stream ss(s);
+                       ::roast::string_output_stream ss(s);
                        //if ( r.generate(ss,doc) == false )
                        generate(ss,r);
                        return s;

diff --git a/roast/include/roast/net/uri.hpp b/roast/include/roast/net/uri.hpp
index 4bb488f..6beb721 100644 (file)
--- a/roast/include/roast/net/uri.hpp
+++ b/roast/include/roast/net/uri.hpp
@@ -7,7 +7,6 @@
 #define __SFJP_ROAST__web__uri_HPP__
 
 #include "roast/lexical.hpp"
-#include "roast/delay_ref.hpp"
 #include <string>
 
 namespace roast
@@ -25,17 +24,17 @@ namespace roast
                        _Scheme, ::roast::lexical::chars::colon, _Body> _Base;
 
        public:
-               uri_(){}
-               uri_(const _Scheme& scheme_in, const _Body& body_in){
-                       scheme = scheme_in;
-                       body = body_in;
-               }
-               
                //delay_ref<_Scheme> scheme;
                //delay_ref<_Body> body;
                _Scheme scheme;
                _Body body;
 
+       public:
+               uri_(){}
+               uri_(const _Scheme& scheme_in, const _Body& body_in) :
+                       scheme(scheme_in), body(body_in)
+               {}
+
                /*_Scheme& scheme(){ return _Base::ref<0>(); }
                const _Scheme& scheme() const { return _Base::ref<0>(); }