NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commitcd5b003

committed

Merge pull request#7 from glynos/0.9-devel

0.9 devel

2 parentse1785e0 +bb9521f commitcd5b003Copy full SHA for cd5b003

File tree

31 files changed

+697

-1326

lines changed

boost/network
- uri.hpp
- uri
  - accessors.hpp
  - detail
    - parse_uri.hpp
  - directives.hpp
  - directives
  - uri.hpp
  - uri_io.hpp
libs/network
- build
  - CMakeLists.txt
  - Jamfile.v2
- example
  - CMakeLists.txt
  - Jamfile.v2
- src
- test

31 files changed

+697

-1326

lines changed

`‎boost/network/uri.hpp‎`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,7 @@`
`6`	`6`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`7`	`7`	`// http://www.boost.org/LICENSE_1_0.txt)`
`8`	`8`
`9`		`-#include<boost/network/traits/string.hpp>`
`10`	`9`	`#include<boost/network/uri/uri.hpp>`
`11`		`-//#include <boost/network/protocol/http/tags.hpp>`
`12`		`-//#include <boost/network/uri/http/uri.hpp>`
`13`		`-`
`14`		`-`
`15`		`-namespaceboost {namespacenetwork {namespaceuri {`
`16`		`-`
`17`		`-typedef basic_uri<std::string> uri;`
`18`		`-typedef basic_uri<std::wstring> wuri;`
`19`		`-`
`20`		`-//namespace http {`
`21`		`-//typedef basic_uri<boost::network::http::tags::http_default_8bit_udp_resolve> uri;`
`22`		`-//}`
`23`		`-}// namespace uri`
`24`		`-}// namespace network`
`25`		`-}// namespace boost`
`26`	`10`
`27`	`11`	`#endif`
`28`	`12`

`‎boost/network/uri/accessors.hpp‎`

Lines changed: 25 additions & 43 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,19 @@`
`12`	`12`	`#include<boost/network/uri/encode.hpp>`
`13`	`13`	`#include<boost/network/uri/decode.hpp>`
`14`	`14`	`#include<boost/spirit/include/qi.hpp>`
	`15`	`+#include<boost/fusion/include/std_pair.hpp>`
`15`	`16`
`16`	`17`
`17`	`18`	`namespaceboost {`
`18`	`19`	`namespacenetwork {`
`19`	`20`	`namespaceuri {`
`20`	`21`	`namespacedetails {`
`21`	`22`	`template<`
`22`		`-typename Uri,`
`23`	`23`	`typename Map`
`24`	`24`	`>`
`25`	`25`	`structkey_value_sequence`
`26`		`- : spirit::qi::grammar<typename Uri::const_iterator, Map()>`
	`26`	`+ : spirit::qi::grammar<uri::const_iterator, Map()>`
`27`	`27`	`{`
`28`		`-typedeftypename Uri::const_iterator const_iterator;`
`29`		`-`
`30`	`28`	`key_value_sequence()`
`31`	`29`	`: key_value_sequence::base_type(query)`
`32`	`30`	`{`
`@@ -36,79 +34,63 @@ struct key_value_sequence`
`36`	`34`	`value = +spirit::qi::char_("a-zA-Z_0-9/%");`
`37`	`35`	`}`
`38`	`36`
`39`		`- spirit::qi::rule<const_iterator, Map()> query;`
`40`		`- spirit::qi::rule<const_iterator, std::pair<typename Uri::string_type,typename Uri::string_type>()> pair;`
`41`		`- spirit::qi::rule<const_iterator,typenameUri::string_type()> key, value;`
	`37`	`+ spirit::qi::rule<uri::const_iterator, Map()> query;`
	`38`	`+ spirit::qi::rule<uri::const_iterator, std::pair<std::string, std::string>()> pair;`
	`39`	`+ spirit::qi::rule<uri::const_iterator,typenamestd::string()> key, value;`
`42`	`40`	`};`
`43`	`41`	`}// namespace details`
`44`	`42`
`45`	`43`	`template<`
`46`		`-classString,`
`47`	`44`	`classMap`
`48`	`45`	`>`
`49`	`46`	`inline`
`50`		`-Map &query_map(constbasic_uri<String> &uri, Map &map) {`
`51`		`-typename basic_uri<String>::const_range_type range =uri.query_range();`
`52`		`- details::key_value_sequence<basic_uri<String>,Map> parser;`
	`47`	`+Map &query_map(consturi &uri_, Map &map) {`
	`48`	`+uri::const_range_type range =uri_.query_range();`
	`49`	`+ details::key_value_sequence<Map> parser;`
`53`	`50`	`spirit::qi::parse(boost::begin(range),boost::end(range), parser, map);`
`54`	`51`	`return map;`
`55`	`52`	`}`
`56`	`53`
`57`		`-template<`
`58`		`-classString`
`59`		`- >`
`60`		`-Stringusername(const basic_uri<String> &uri) {`
`61`		`-typename basic_uri<String>::const_range_type user_info_range = uri.user_info_range();`
`62`		`-typename basic_uri<String>::const_iteratorit(boost::begin(user_info_range)),end(boost::end(user_info_range));`
	`54`	`+std::stringusername(const uri &uri_) {`
	`55`	`+ uri::const_range_type user_info_range = uri_.user_info_range();`
	`56`	`+ uri::const_iteratorit(boost::begin(user_info_range)),end(boost::end(user_info_range));`
`63`	`57`	`for (; it != end; ++it) {`
`64`	`58`	`if (*it ==':') {`
`65`	`59`	`break;`
`66`	`60`	`}`
`67`	`61`	`}`
`68`		`-returnString(boost::begin(user_info_range), it);`
	`62`	`+returnstd::string(boost::begin(user_info_range), it);`
`69`	`63`	`}`
`70`	`64`
`71`		`-template<`
`72`		`-classString`
`73`		`- >`
`74`		`-Stringpassword(const basic_uri<String> &uri) {`
`75`		`-typename basic_uri<String>::const_range_type user_info_range = uri.user_info_range();`
`76`		`-typename basic_uri<String>::const_iteratorit(boost::begin(user_info_range)),end(boost::end(user_info_range));`
	`65`	`+std::stringpassword(const uri &uri_) {`
	`66`	`+ uri::const_range_type user_info_range = uri_.user_info_range();`
	`67`	`+ uri::const_iteratorit(boost::begin(user_info_range)),end(boost::end(user_info_range));`
`77`	`68`	`for (; it != end; ++it) {`
`78`	`69`	`if (*it ==':') {`
`79`	`70`	`++it;`
`80`	`71`	`break;`
`81`	`72`	`}`
`82`	`73`	`}`
`83`		`-returnString(it,boost::end(user_info_range));`
	`74`	`+returnstd::string(it,boost::end(user_info_range));`
`84`	`75`	`}`
`85`	`76`
`86`		`-template<`
`87`		`-classString`
`88`		`- >`
`89`		`-Stringdecoded_path(const basic_uri<String> &uri) {`
`90`		`-typename basic_uri<String>::const_range_type path_range = uri.path_range();`
`91`		`- String decoded_path;`
	`77`	`+std::stringdecoded_path(const uri &uri_) {`
	`78`	`+ uri::const_range_type path_range = uri_.path_range();`
	`79`	`+ std::string decoded_path;`
`92`	`80`	`decode(path_range,std::back_inserter(decoded_path));`
`93`	`81`	`return decoded_path;`
`94`	`82`	`}`
`95`	`83`
`96`		`-template<`
`97`		`-classString`
`98`		`- >`
`99`		`-Stringdecoded_query(const basic_uri<String> &uri) {`
`100`		`-typename basic_uri<String>::const_range_type query_range = uri.query_range();`
`101`		`- String decoded_query;`
	`84`	`+std::stringdecoded_query(const uri &uri_) {`
	`85`	`+ uri::const_range_type query_range = uri_.query_range();`
	`86`	`+ std::string decoded_query;`
`102`	`87`	`decode(query_range,std::back_inserter(decoded_query));`
`103`	`88`	`return decoded_query;`
`104`	`89`	`}`
`105`	`90`
`106`		`-template<`
`107`		`-classString`
`108`		`- >`
`109`		`-Stringdecoded_fragment(const basic_uri<String> &uri) {`
`110`		`-typename basic_uri<String>::const_range_type fragment_range = uri.fragment_range();`
`111`		`- String decoded_fragment;`
	`91`	`+std::stringdecoded_fragment(const uri &uri_) {`
	`92`	`+ uri::const_range_type fragment_range = uri_.fragment_range();`
	`93`	`+ std::string decoded_fragment;`
`112`	`94`	`decode(fragment_range,std::back_inserter(decoded_fragment));`
`113`	`95`	`return decoded_fragment;`
`114`	`96`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcd5b003

File tree

31 files changed

31 files changed

`‎boost/network/uri.hpp‎`

`‎boost/network/uri/accessors.hpp‎`

0 commit comments