Cleaned up URI again.

glynos · glynos · commit e1183101903e · 2011-12-11T12:14:09.000+01:00
diff --git a/boost/network/uri/detail/uri_parts.hpp b/boost/network/uri/detail/uri_parts.hpp
@@ -7,15 +7,15 @@
 # define BOOST_NETWORK_URL_DETAIL_URL_PARTS_HPP_
 
 
-# include <string>
-
-
 namespace boost {
 namespace network {
 namespace uri {
 namespace detail {
+template <
+    class String
+    >
 struct hierarchical_part {
-    std::string user_info, host, port, path;
+    String user_info, host, port, path;
 
     void clear() {
         user_info.clear();
@@ -25,11 +25,14 @@ struct hierarchical_part {
     }
 };
 
+template <
+    class String
+    >
 struct uri_parts {
-    std::string scheme;
-    hierarchical_part hier_part;
-    std::string query;
-    std::string fragment;
+    String scheme;
+    hierarchical_part<String> hier_part;
+    String query;
+    String fragment;
 
     void clear() {
         scheme.clear();
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -22,7 +22,7 @@ namespace uri {
 namespace detail {
 bool parse(std::string::const_iterator first,
            std::string::const_iterator last,
-           uri_parts &parts);
+           uri_parts<std::string> &parts);
 } // namespace detail
 
 
@@ -150,7 +150,7 @@ class uri
     void parse();
 
     string_type uri_;
-    detail::uri_parts uri_parts_;
+    detail::uri_parts<std::string> uri_parts_;
     bool is_valid_;
 
 };
diff --git a/libs/network/src/uri/parse.cpp b/libs/network/src/uri/parse.cpp
@@ -9,22 +9,24 @@
 #include <boost/spirit/home/qi.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 
-BOOST_FUSION_ADAPT_STRUCT
+BOOST_FUSION_ADAPT_TPL_STRUCT
 (
-    boost::network::uri::detail::hierarchical_part,
-    (std::string, user_info)
-    (std::string, host)
-    (std::string, port)
-    (std::string, path)
+    (String),
+    (boost::network::uri::detail::hierarchical_part)(String),
+    (String, user_info)
+    (String, host)
+    (String, port)
+    (String, path)
     );
 
-BOOST_FUSION_ADAPT_STRUCT
+BOOST_FUSION_ADAPT_TPL_STRUCT
 (
-    boost::network::uri::detail::uri_parts,
-    (std::string, scheme)
-    (boost::network::uri::detail::hierarchical_part, hier_part)
-    (std::string, query)
-    (std::string, fragment)
+    (String),
+    (boost::network::uri::detail::uri_parts)(String),
+    (String, scheme)
+    (boost::network::uri::detail::hierarchical_part<String>, hier_part)
+    (String, query)
+    (String, fragment)
     );
 
 namespace boost {
@@ -38,7 +40,7 @@ template <
     >
 struct uri_grammar : qi::grammar<
     typename String::const_iterator
-  , detail::uri_parts()> {
+  , detail::uri_parts<String>()> {
 
     typedef String string_type;
     typedef typename String::const_iterator const_iterator;
@@ -216,17 +218,17 @@ struct uri_grammar : qi::grammar<
     qi::rule<const_iterator, string_type()>
     scheme, user_info, query, fragment;
 
-    qi::rule<const_iterator, hierarchical_part()>
+    qi::rule<const_iterator, hierarchical_part<string_type>()>
     hier_part;
 
     // actual uri parser
-    qi::rule<const_iterator, uri_parts()> start;
+    qi::rule<const_iterator, uri_parts<string_type>()> start;
 
 };
 
 bool parse(std::string::const_iterator first,
            std::string::const_iterator last,
-           uri_parts &parts) {
+           uri_parts<std::string> &parts) {
     namespace qi = boost::spirit::qi;
     static detail::uri_grammar<std::string> grammar;
     bool is_valid = qi::parse(first, last, grammar, parts);
