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

Commit944ba1b

Browse files
committed
Fixing more unqualified calls to begin(range) and end(range) that cause errors with MSVC 10.
1 parent462b008 commit944ba1b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎boost/network/protocol/http/impl/sync_connection_base.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ namespace boost { namespace network { namespace http { namespace impl {
119119
typename headers_range<basic_response<Tag> >::type transfer_encoding_range =
120120
headers(response_)["Transfer-Encoding"];
121121
if (empty(transfer_encoding_range))throwstd::runtime_error("Missing Transfer-Encoding Header from response.");
122-
if (boost::iequals(begin(transfer_encoding_range)->second,"chunked")) {
122+
if (boost::iequals(boost::begin(transfer_encoding_range)->second,"chunked")) {
123123
bool stopping =false;
124124
do {
125125
std::size_t chunk_size_line =read_until(socket_, response_buffer,"\r\n", error);
@@ -158,7 +158,7 @@ namespace boost { namespace network { namespace http { namespace impl {
158158
}while (!stopping);
159159
}elsethrowstd::runtime_error("Unsupported Transfer-Encoding.");
160160
}else {
161-
size_t length = lexical_cast<size_t>(begin(content_length_range)->second);
161+
size_t length = lexical_cast<size_t>(boost::begin(content_length_range)->second);
162162
size_t bytes_read =0;
163163
while ((bytes_read =boost::asio::read(socket_, response_buffer,boost::asio::transfer_at_least(1), error))) {
164164
body_stream << &response_buffer;
@@ -234,7 +234,7 @@ namespace boost { namespace network { namespace http { namespace impl {
234234
connection_base::read_body(socket_, response_, response_buffer);
235235
typename headers_range<basic_response<Tag> >::type connection_range =
236236
headers(response_)["Connection"];
237-
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(begin(connection_range)->second,"close")) {
237+
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(boost::begin(connection_range)->second,"close")) {
238238
close_socket();
239239
}elseif (version_major ==1 && version_minor ==0) {
240240
close_socket();
@@ -296,7 +296,7 @@ namespace boost { namespace network { namespace http { namespace impl {
296296
connection_base::read_body(socket_, response_, response_buffer);
297297
typename headers_range<basic_response<Tag> >::type connection_range =
298298
headers(response_)["Connection"];
299-
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(begin(connection_range)->second,"close")) {
299+
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::iequals(boost::begin(connection_range)->second,"close")) {
300300
close_socket();
301301
}elseif (version_major ==1 && version_minor ==0) {
302302
close_socket();

‎boost/network/protocol/http/policies/pooled_connection.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ namespace boost { namespace network { namespace http {
8989
}
9090

9191
typename headers_range<basic_response<Tag> >::type connection_range =headers(response_)["Connection"];
92-
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&begin(connection_range)->second ==string_type("close")) {
92+
if (version_major ==1 && version_minor ==1 && !empty(connection_range) &&boost::begin(connection_range)->second ==string_type("close")) {
9393
pimpl->close_socket();
9494
}elseif (version_major ==1 && version_minor ==0) {
9595
pimpl->close_socket();
@@ -99,8 +99,8 @@ namespace boost { namespace network { namespace http {
9999
boost::uint16_t status = response_.status();
100100
if (status >=300 && status <=307) {
101101
typename headers_range<basic_response<Tag> >::type location_range =headers(response_)["Location"];
102-
typename range_iterator<typename headers_range<basic_request<Tag> >::type>::type location_header =begin(location_range);
103-
if (location_header !=end(location_range)) {
102+
typename range_iterator<typename headers_range<basic_request<Tag> >::type>::type location_header =boost::begin(location_range);
103+
if (location_header !=boost::end(location_range)) {
104104
request_.uri(location_header->second);
105105
connection_ptr connection_;
106106
connection_ =get_connection_(resolver_, request_);
@@ -137,12 +137,12 @@ namespace boost { namespace network { namespace http {
137137
, follow_redirect_
138138
, request_.host()
139139
, lexical_cast<string_type>(request_.port())
140-
,bind(
140+
,boost::bind(
141141
&pooled_connection_policy<Tag,version_major,version_minor>::resolve,
142142
this,
143143
_1, _2, _3
144144
)
145-
,bind(
145+
,boost::bind(
146146
&pooled_connection_policy<Tag,version_major,version_minor>::get_connection,
147147
this,
148148
_1, _2

0 commit comments

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