Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfc780ae

Browse files
committed
Request/Reponse changes to follow message_base changes.
1 parent4ef1f27 commitfc780ae

File tree

3 files changed

+146
-153
lines changed

3 files changed

+146
-153
lines changed

‎include/network/protocol/http/request/request.hpp‎

Lines changed: 69 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -15,83 +15,80 @@
1515

1616
namespacenetwork {namespacehttp {
1717

18-
structrequest_pimpl;
19-
20-
structrequest : request_base {
21-
// We support full value semantics.
22-
request();
23-
explicitrequest(std::stringconst & url);
24-
explicitrequest(::network::uriconst & url);
25-
request(requestconst &);
26-
request&operator=(request);
27-
voidswap(request & other);
28-
boolequals(requestconst &other)const;
29-
30-
// From message_base...
31-
// Mutators
32-
virtualvoidset_destination(std::stringconst & destination);
33-
virtualvoidset_source(std::stringconst & source);
34-
virtualvoidappend_header(std::stringconst & name,
35-
std::stringconst & value);
36-
virtualvoidremove_headers(std::stringconst & name);
37-
virtualvoidremove_headers();
38-
virtualvoidset_body(std::stringconst & body);
39-
virtualvoidappend_body(std::stringconst & data);
40-
41-
// Retrievers
42-
virtualvoidget_destination(std::string & destination)const;
43-
virtualvoidget_source(std::string & source)const;
44-
virtualvoidget_headers(boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
45-
virtualvoidget_headers(std::stringconst & name, boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
46-
virtualvoidget_headers(boost::function<bool(std::stringconst &, std::stringconst &)> predicate, boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
47-
virtualvoidget_body(std::string & body)const;
48-
virtualvoidget_body(boost::function<void(boost::iterator_range<charconst *>)> chunk_reader, size_t size)const;
49-
50-
// From request_base...
51-
// Setters
52-
virtualvoidset_method(std::stringconst & method);
53-
virtualvoidset_status(std::stringconst & status);
54-
virtualvoidset_status_message(std::stringconst & status_message);
55-
virtualvoidset_body_writer(boost::function<void(char*,size_t)> writer);
56-
virtualvoidset_uri(std::stringconst &uri);
57-
virtualvoidset_uri(::network::uriconst &uri);
58-
virtualvoidset_version_major(unsignedshort major_version);
59-
virtualvoidset_version_minor(unsignedshort minor_version);
60-
61-
// Getters
62-
virtualvoidget_uri(::network::uri &uri)const;
63-
virtualvoidget_uri(std::string &uri)const;
64-
virtualvoidget_method(std::string & method)const;
65-
virtualvoidget_status(std::string & status)const;
66-
virtualvoidget_status_message(std::string & status_message)const;
67-
virtualvoidget_body(boost::function<void(char*,size_t)> chunk_reader)const;
68-
virtualvoidget_body(std::stringconst & body)const;
69-
virtualvoidget_version_major(unsignedshort &major_version);
70-
virtualvoidget_version_minor(unsignedshort &minor_version);
71-
72-
virtual~request();
73-
private:
74-
request_pimpl* pimpl_;
75-
};
76-
77-
template<classDirective>
78-
request_base &operator<< (request_base & request,
79-
Directiveconst & directive) {
18+
structrequest_pimpl;
19+
20+
structrequest : request_base {
21+
// We support full value semantics.
22+
request();
23+
explicitrequest(std::stringconst & url);
24+
explicitrequest(::network::uriconst & url);
25+
request(requestconst &);
26+
request&operator=(request);
27+
28+
// From message_base...
29+
// Mutators
30+
virtualvoidset_destination(std::stringconst & destination);
31+
virtualvoidset_source(std::stringconst & source);
32+
virtualvoidappend_header(std::stringconst & name,
33+
std::stringconst & value);
34+
virtualvoidremove_headers(std::stringconst & name);
35+
virtualvoidremove_headers();
36+
virtualvoidset_body(std::stringconst & body);
37+
virtualvoidappend_body(std::stringconst & data);
38+
39+
// Retrievers
40+
virtualvoidget_destination(std::string & destination)const;
41+
virtualvoidget_source(std::string & source)const;
42+
virtualvoidget_headers(boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
43+
virtualvoidget_headers(std::stringconst & name, boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
44+
virtualvoidget_headers(boost::function<bool(std::stringconst &, std::stringconst &)> predicate, boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
45+
virtualvoidget_body(std::string & body)const;
46+
virtualvoidget_body(boost::function<void(std::string::const_iterator,size_t)> chunk_reader, size_t size)const;
47+
48+
// From request_base...
49+
// Setters
50+
virtualvoidset_method(std::stringconst & method);
51+
virtualvoidset_status(std::stringconst & status);
52+
virtualvoidset_status_message(std::stringconst & status_message);
53+
virtualvoidset_body_writer(boost::function<void(char*,size_t)> writer);
54+
virtualvoidset_uri(std::stringconst &uri);
55+
virtualvoidset_uri(::network::uriconst &uri);
56+
virtualvoidset_version_major(unsignedshort major_version);
57+
virtualvoidset_version_minor(unsignedshort minor_version);
58+
59+
// Getters
60+
virtualvoidget_uri(::network::uri &uri)const;
61+
virtualvoidget_uri(std::string &uri)const;
62+
virtualvoidget_method(std::string & method)const;
63+
virtualvoidget_status(std::string & status)const;
64+
virtualvoidget_status_message(std::string & status_message)const;
65+
virtualvoidget_body(boost::function<void(std::string::const_iterator,size_t)> chunk_reader)const;
66+
virtualvoidget_version_major(unsignedshort &major_version);
67+
virtualvoidget_version_minor(unsignedshort &minor_version);
68+
69+
virtual~request();
70+
private:
71+
request_pimpl* pimpl_;
72+
};
73+
74+
template<classDirective>
75+
request_base &operator<< (request_base & request,
76+
Directiveconst & directive) {
8077
directive(request);
8178
return request;
82-
}
79+
}
8380

84-
inlinevoidswap(request &l, request &r) {
85-
l.swap(r);
86-
}
81+
inlinevoidswap(request &l, request &r) {
82+
l.swap(r);
83+
}
8784

88-
inlinebooloperator==(requestconst &l, requestconst &r) {
89-
return l.equals(r);
90-
}
85+
inlinebooloperator==(requestconst &l, requestconst &r) {
86+
return l.equals(r);
87+
}
9188

92-
inlinebooloperator!=(requestconst &l, requestconst &r) {
93-
return !l.equals(r);
94-
}
89+
inlinebooloperator!=(requestconst &l, requestconst &r) {
90+
return !l.equals(r);
91+
}
9592

9693
}// namespace http
9794
}// namespace network

‎include/network/protocol/http/request/request_base.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct request_base : message_base, request_storage_base {
5454
virtualvoidget_method(std::string & method)const = 0;
5555
virtualvoidget_status(std::string & status)const = 0;
5656
virtualvoidget_status_message(std::string & status_message)const = 0;
57-
virtualvoidget_body(boost::function<void(char*,size_t)> chunk_reader)const = 0;
57+
virtualvoidget_body(boost::function<void(std::string::const_iterator,size_t)> chunk_reader, size_t size)const = 0;
5858
virtualvoidget_body(std::string & body)const = 0;
5959
virtual~request_base() =0;
6060
};

‎include/network/protocol/http/response/response.hpp‎

Lines changed: 76 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -12,88 +12,84 @@
1212

1313
namespacenetwork {namespacehttp {
1414

15-
structresponse_pimpl;
16-
17-
structresponse : response_base {
18-
response();
19-
response(responseconst &);
20-
response&operator=(response);
21-
voidswap(response &);
22-
boolequals(responseconst &)const;
23-
24-
// From message_base...
25-
// Mutators
26-
virtualvoidset_destination(std::stringconst & destination);
27-
virtualvoidset_source(std::stringconst & source);
28-
virtualvoidappend_header(std::stringconst & name,
29-
std::stringconst & value);
30-
virtualvoidremove_headers(std::stringconst & name);
31-
virtualvoidremove_headers();
32-
virtualvoidset_body(std::stringconst & body);
33-
virtualvoidappend_body(std::stringconst & data);
34-
35-
// Retrievers
36-
virtualvoidget_destination(std::string & destination)const;
37-
virtualvoidget_source(std::string & source)const;
38-
virtualvoidget_headers(
39-
boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
40-
virtualvoidget_headers(
41-
std::stringconst & name,
42-
boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
43-
virtualvoidget_headers(
44-
boost::function<bool(std::stringconst &, std::stringconst &)> predicate,
45-
boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
46-
virtualvoidget_body(std::string & body)const;
47-
virtualvoidget_body(
48-
boost::function<void(boost::iterator_range<charconst *>)> chunk_reader,
49-
size_t size)const;
50-
51-
// From response_base...
52-
virtualvoidset_status(boost::uint16_t new_status);
53-
virtualvoidset_status_message(std::stringconst & new_status_message);
54-
virtualvoidset_version(std::stringconst & new_version);
55-
virtualvoidget_status(boost::uint16_t &status)const;
56-
virtualvoidget_status_message(std::string &status_message)const;
57-
virtualvoidget_version(std::string &version)const;
58-
virtual~response();
59-
60-
private:
61-
friendstructimpl::setter_access;// Hide access through accessor class.
62-
// These methods are unique to the response type which will allow for creating
63-
// promises that can be set appropriately.
64-
voidset_version_promise(boost::promise<std::string>&);
65-
voidset_status_promise(boost::promise<boost::uint16_t>&);
66-
voidset_status_message_promise(boost::promise<std::string>&);
67-
voidset_headers_promise(boost::promise<std::multimap<std::string, std::string> >&);
68-
voidset_source_promise(boost::promise<std::string>&);
69-
voidset_destination_promise(boost::promise<std::string>&);
70-
voidset_body_promise(boost::promise<std::string>&);
71-
72-
response_pimpl *pimpl_;
73-
};
74-
75-
inlinevoidswap(response &l, response &r) {
76-
l.swap(r);
77-
}
78-
79-
inlinebooloperator==(responseconst &l, responseconst &r) {
80-
return l.equals(r);
81-
}
82-
83-
inlinebooloperator!=(responseconst &l, responseconst &r) {
84-
return !l.equals(r);
85-
}
86-
87-
template<classDirective>
88-
response &operator<<(
89-
response & message,
90-
Directiveconst & directive
91-
)
92-
{
15+
structresponse_pimpl;
16+
17+
structresponse : response_base {
18+
response();
19+
response(responseconst &);
20+
response&operator=(response);
21+
voidswap(response &);
22+
boolequals(responseconst &)const;
23+
24+
// From message_base...
25+
// Mutators
26+
virtualvoidset_destination(std::stringconst & destination);
27+
virtualvoidset_source(std::stringconst & source);
28+
virtualvoidappend_header(std::stringconst & name,
29+
std::stringconst & value);
30+
virtualvoidremove_headers(std::stringconst & name);
31+
virtualvoidremove_headers();
32+
virtualvoidset_body(std::stringconst & body);
33+
virtualvoidappend_body(std::stringconst & data);
34+
35+
// Retrievers
36+
virtualvoidget_destination(std::string & destination)const;
37+
virtualvoidget_source(std::string & source)const;
38+
virtualvoidget_headers(boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
39+
virtualvoidget_headers(std::stringconst & name,
40+
boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
41+
virtualvoidget_headers(boost::function<bool(std::stringconst &, std::stringconst &)> predicate,
42+
boost::function<void(std::stringconst &, std::stringconst &)> inserter)const;
43+
virtualvoidget_body(std::string & body)const;
44+
virtualvoidget_body(boost::function<void(std::string::const_iterator,size_t)> chunk_reader,
45+
size_t size)const;
46+
47+
// From response_base...
48+
virtualvoidset_status(boost::uint16_t new_status);
49+
virtualvoidset_status_message(std::stringconst & new_status_message);
50+
virtualvoidset_version(std::stringconst & new_version);
51+
virtualvoidget_status(boost::uint16_t &status)const;
52+
virtualvoidget_status_message(std::string &status_message)const;
53+
virtualvoidget_version(std::string &version)const;
54+
virtual~response();
55+
56+
private:
57+
friendstructimpl::setter_access;// Hide access through accessor class.
58+
// These methods are unique to the response type which will allow for creating
59+
// promises that can be set appropriately.
60+
voidset_version_promise(boost::promise<std::string>&);
61+
voidset_status_promise(boost::promise<boost::uint16_t>&);
62+
voidset_status_message_promise(boost::promise<std::string>&);
63+
voidset_headers_promise(boost::promise<std::multimap<std::string, std::string> >&);
64+
voidset_source_promise(boost::promise<std::string>&);
65+
voidset_destination_promise(boost::promise<std::string>&);
66+
voidset_body_promise(boost::promise<std::string>&);
67+
68+
response_pimpl *pimpl_;
69+
};
70+
71+
inlinevoidswap(response &l, response &r) {
72+
l.swap(r);
73+
}
74+
75+
inlinebooloperator==(responseconst &l, responseconst &r) {
76+
return l.equals(r);
77+
}
78+
79+
inlinebooloperator!=(responseconst &l, responseconst &r) {
80+
return !l.equals(r);
81+
}
82+
83+
template<classDirective>
84+
response &operator<<(
85+
response & message,
86+
Directiveconst & directive
87+
)
88+
{
9389
directive(message);
9490
return message;
95-
}
96-
91+
}
92+
9793
}// namespace http
9894
}// namespace network
9995

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp