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

Commit3312a7b

Browse files
committed
Merge branch '0.8-devel' of git://github.com/mikhailberis/cpp-netlib into xmpp
2 parents21f56c2 +3efd6c0 commit3312a7b

File tree

20 files changed

+144
-93
lines changed

20 files changed

+144
-93
lines changed

‎boost/network/include/message.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//
99
// This is the modular include file for using the basic message type
1010

11+
#include<boost/network/tags.hpp>
1112
#include<boost/network/message.hpp>
1213

1314
#endif// BOOST_NETWORK_INCLUDE_MESSAGE_HPP_

‎boost/network/message.hpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __NETWORK_MESSAGE_HPP__
77
#define__NETWORK_MESSAGE_HPP__
88

9-
#include"boost/network/message_fwd.hpp"
9+
#include<boost/network/message_fwd.hpp>
1010
#include<boost/network/traits/string.hpp>
1111
#include<boost/network/traits/ostringstream.hpp>
1212
#include<boost/network/traits/headers_container.hpp>
@@ -38,7 +38,7 @@ namespace boost { namespace network {
3838
/** The common message type.
3939
*/
4040
template<classTag>
41-
classbasic_message {
41+
structbasic_message {
4242
public:
4343

4444
typedef Tag tag;
@@ -138,9 +138,12 @@ namespace boost { namespace network {
138138
// swap for ADL
139139
left.swap(right);
140140
}
141-
142-
BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));
143-
BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));
141+
142+
// Commenting this out as we don't need to do this anymore.
143+
// BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));
144+
// BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));
145+
typedef basic_message<tags::default_string> message;
146+
typedef basic_message<tags::default_wstring> wmessage;
144147

145148
}// namespace network
146149
}// namespace boost

‎boost/network/message/wrappers/headers.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace boost { namespace network {
2525
};
2626

2727
template<classTag>
28-
classbasic_message;
28+
structbasic_message;
2929

3030
/** headers wrapper for messages.
3131
*

‎boost/network/message_fwd.hpp‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,12 @@
66
#ifndef __2008817MESSAGE_FWD_INC__
77
#define__2008817MESSAGE_FWD_INC__
88

9-
10-
// Includes
11-
#include<boost/network/tags.hpp>
12-
13-
149
namespaceboost {
1510
namespacenetwork {
16-
template<
17-
classTag
18-
>
19-
classbasic_message;
2011

12+
template<classTag>
13+
structbasic_message;
2114

22-
typedef basic_message<tags::default_string> message;
23-
typedef basic_message<tags::default_wstring> wmessage;
2415
}// namespace boost
2516
}// namespace network
2617

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ namespace boost { namespace network { namespace http { namespace impl {
5050
resolve_function resolve,
5151
bool follow_redirect
5252
) :
53+
follow_redirect_(follow_redirect),
5354
resolver_(resolver),
5455
resolve_(resolve),
55-
follow_redirect_(follow_redirect),
5656
request_strand_(new boost::asio::io_service::strand(resolver->get_io_service()))
5757
{}
5858

@@ -303,11 +303,11 @@ namespace boost { namespace network { namespace http { namespace impl {
303303
}
304304
}
305305

306-
boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
306+
bool follow_redirect_;
307307
boost::shared_ptr<resolver_type> resolver_;
308308
boost::shared_ptr<boost::asio::ip::tcp::socket> socket_;
309309
resolve_function resolve_;
310-
bool follow_redirect_;
310+
boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
311311
string_type command_string_;
312312
string_type method;
313313
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ namespace boost { namespace network { namespace http { namespace impl {
3939
bool follow_redirect,
4040
optional<string_type>const & certificate_filename = optional<string_type>()
4141
) :
42+
follow_redirect_(follow_redirect),
4243
resolver_(resolver),
44+
certificate_filename_(certificate_filename),
4345
resolve_(resolve),
44-
follow_redirect_(follow_redirect),
45-
request_strand_(new boost::asio::io_service::strand(resolver->get_io_service())),
46-
certificate_filename_(certificate_filename)
46+
request_strand_(new boost::asio::io_service::strand(resolver->get_io_service()))
4747
{}
4848

4949

@@ -337,13 +337,13 @@ namespace boost { namespace network { namespace http { namespace impl {
337337
}
338338
}
339339

340-
boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
340+
bool follow_redirect_;
341341
boost::shared_ptr<resolver_type> resolver_;
342342
optional<string_type> certificate_filename_;
343343
resolve_function resolve_;
344344
boost::shared_ptr<boost::asio::ssl::context> context_;
345345
boost::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> > socket_;
346-
bool follow_redirect_;
346+
boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
347347
string_type command_string_;
348348
string_type method;
349349
};

‎boost/network/protocol/http/message/wrappers/anchor.hpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
#include<boost/concept/requires.hpp>
11-
1210
namespaceboost {namespacenetwork {namespacehttp {
1311

1412
template<classTag>
@@ -27,12 +25,8 @@ namespace boost { namespace network { namespace http {
2725
};
2826
}
2927

30-
template<classMessage>
31-
structRequest;
32-
3328
template<classTag>inline
34-
BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
35-
(impl::anchor_wrapper<Tag>))
29+
impl::anchor_wrapper<Tag>
3630
anchor(basic_request<Tag>const & request) {
3731
return impl::anchor_wrapper<Tag>(request);
3832
}

‎boost/network/protocol/http/message/wrappers/body.hpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,16 @@ namespace boost { namespace network { namespace http {
3131

3232
}// namespace impl
3333

34-
template<classR>
35-
structResponse;
36-
37-
template<classR>
38-
structRequest;
39-
4034
template<classTag>
4135
inline
42-
BOOST_CONCEPT_REQUIRES(((Response<basic_response<Tag> >)),
43-
(typename impl::body_wrapper<basic_response<Tag> >::string_typeconst))
36+
typename impl::body_wrapper<basic_response<Tag> >::string_typeconst
4437
body(basic_response<Tag>const & message) {
4538
return impl::body_wrapper<basic_response<Tag> >(message);
4639
}
4740

4841
template<classTag>
49-
inlineBOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
50-
(typename impl::body_wrapper<basic_request<Tag> >::string_typeconst))
42+
inline
43+
typename impl::body_wrapper<basic_request<Tag> >::string_typeconst
5144
body(basic_request<Tag>const & message) {
5245
return impl::body_wrapper<basic_request<Tag> >(message);
5346
}

‎boost/network/protocol/http/message/wrappers/helper.hpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// http://www.boost.org/LICENSE_1_0.txt)
88

99
#include<boost/mpl/if.hpp>
10-
#include<boost/concept/requires.hpp>
1110

1211
#ifndef BOOST_NETWORK_DEFINE_HTTP_WRAPPER
1312
#defineBOOST_NETWORK_DEFINE_HTTP_WRAPPER(name, accessor, pod_field) \
@@ -48,21 +47,21 @@
4847
: message_(message) {} \
4948
name##_wrapper(name##_wrapperconst & other) \
5049
: message_(other.message_) {} \
51-
operatorstring_type (){ \
50+
operatorstring_type ()const { \
5251
returnthis->get_value(message_); \
5352
} \
5453
}; \
5554
\
5655
template<classTag> \
57-
inlineBOOST_CONCEPT_REQUIRES(((Response<basic_response<Tag> >)), \
58-
(name##_wrapper<basic_response<Tag> >const)) \
56+
inline \
57+
name##_wrapper<basic_response<Tag> >const \
5958
name (basic_response<Tag>const & message) { \
6059
return name##_wrapper<basic_response<Tag> >(message); \
6160
} \
6261
\
6362
template<classTag> \
64-
inlineBOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)), \
65-
(name##_wrapper<basic_request<Tag> >const)) \
63+
inline \
64+
name##_wrapper<basic_request<Tag> >const \
6665
name (basic_request<Tag>const & message) { \
6766
return name##_wrapper<basic_request<Tag> >(message); \
6867
}

‎boost/network/protocol/http/message/wrappers/host.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
// (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
#include<boost/network/protocol/http/request_concept.hpp>
11-
#include<boost/concept/requires.hpp>
12-
1310
namespaceboost {namespacenetwork {namespacehttp {
1411

1512
template<classTag>
@@ -35,8 +32,7 @@ namespace boost { namespace network { namespace http {
3532

3633
template<classTag>
3734
inline
38-
BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
39-
(impl::host_wrapper<Tag>))
35+
impl::host_wrapper<Tag>
4036
host(basic_request<Tag>const & request) {
4137
return impl::host_wrapper<Tag>(request);
4238
}

0 commit comments

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