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

Commit91d0a73

Browse files
committed
Fully Qualify Boost Libraries
Batch 1 of changes to fully qualify boost:: namespaces now that wedon't live in boost:: anymore.
1 parentc226fd5 commit91d0a73

File tree

45 files changed

+196
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+196
-196
lines changed

‎include/network/message/directives.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
namespacenetwork {
1515

16-
BOOST_NETWORK_STRING_DIRECTIVE(source);
17-
BOOST_NETWORK_STRING_DIRECTIVE(destination);
18-
BOOST_NETWORK_STRING_DIRECTIVE(body);
16+
NETWORK_STRING_DIRECTIVE(source);
17+
NETWORK_STRING_DIRECTIVE(destination);
18+
NETWORK_STRING_DIRECTIVE(body);
1919

2020
}// namespace network
2121

‎include/network/message/message_base.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ struct message_base {
2626
// Retrievers
2727
virtualvoidget_destination(std::string & destination)const = 0;
2828
virtualvoidget_source(std::string & source)const = 0;
29-
virtualvoidget_headers(function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
30-
virtualvoidget_headers(std::stringconst & name, function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
31-
virtualvoidget_headers(function<bool(std::stringconst &, std::stringconst &)> predicate, function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
29+
virtualvoidget_headers(boost::function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
30+
virtualvoidget_headers(std::stringconst & name,boost::function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
31+
virtualvoidget_headers(boost::function<bool(std::stringconst &, std::stringconst &)> predicate,boost::function<void(std::stringconst &, std::stringconst &)> inserter)const = 0;
3232
virtualvoidget_body(std::string & body)const = 0;
33-
virtualvoidget_body(function<void(iterator_range<charconst *>)> chunk_reader, size_t size)const = 0;
33+
virtualvoidget_body(boost::function<void(boost::iterator_range<charconst *>)> chunk_reader, size_t size)const = 0;
3434

3535
// Destructor
3636
virtual~message_base() =0;// pure virtual

‎include/network/message/message_concept.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ namespace network {
1919

2020
template<classM>
2121
structMessage
22-
: DefaultConstructible<M>, CopyConstructible<M>, Assignable<M> {
22+
: boost::DefaultConstructible<M>,
23+
boost::CopyConstructible<M>,
24+
boost::Assignable<M> {
2325

24-
CONCEPT_USAGE(Message) {
26+
BOOST_CONCEPT_USAGE(Message) {
2527
M message_;
2628
swap(message, message_);
2729
typedef std::string source_type;

‎include/network/message/transformers/selectors.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ struct source_selector {
2222
private:
2323
source_selector() {};
2424
source_selector(source_selectorconst &) {};
25-
friend source_selectorboost::network::source_(source_selector);
25+
friend source_selectornetwork::source_(source_selector);
2626
};
2727

2828
structdestination_selector {
2929
private:
3030
destination_selector() {};
3131
destination_selector(destination_selectorconst &) {};
32-
friend destination_selectorboost::network::destination_(destination_selector);
32+
friend destination_selectornetwork::destination_(destination_selector);
3333
};
3434

3535
}// namespace selectors

‎include/network/message/transformers/to_lower.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct to_lower_placeholder_helper {
6868
private:
6969
to_lower_placeholder_helper() {}
7070
to_lower_placeholder_helper(to_lower_placeholder_helperconst &) {}
71-
friend to_lower_placeholder_helperboost::network::to_lower_(to_lower_placeholder_helper);
71+
friend to_lower_placeholder_helpernetwork::to_lower_(to_lower_placeholder_helper);
7272
};
7373

7474
}// namespace detail

‎include/network/message/transformers/to_upper.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct to_upper_placeholder_helper {
6969
private:
7070
to_upper_placeholder_helper() {}
7171
to_upper_placeholder_helper(to_upper_placeholder_helperconst &) {}
72-
friend to_upper_placeholder_helperboost::network::to_upper_(to_upper_placeholder_helper);
72+
friend to_upper_placeholder_helpernetwork::to_upper_(to_upper_placeholder_helper);
7373
};
7474

7575
}// namespace detail

‎include/network/message/wrappers/body.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ struct body_wrapper {
1717
explicitbody_wrapper(message_baseconst & message);
1818
operatorstd::string ()const;
1919
std::size_tsize()const;
20-
operator iterator_range<std::string::const_iterator> ()const;
20+
operatorboost::iterator_range<std::string::const_iterator> ()const;
2121
std::string::const_iteratorbegin()const;
2222
std::string::const_iteratorend()const;
2323
private:
2424
message_baseconst & message_;
25-
mutable optional<std::string> cache_;
25+
mutableboost::optional<std::string> cache_;
2626
};
2727

2828
inline std::ostream &operator<<(std::ostream & os, body_wrapperconst & body) {

‎include/network/message/wrappers/destination.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct destination_wrapper {
1616
operatorstd::string ()const;
1717
private:
1818
message_baseconst & message_;
19-
mutable optional<std::string> cache_;
19+
mutableboost::optional<std::string> cache_;
2020
};
2121

2222
inline destination_wrapperconst

‎include/network/protocol/http/client/client_connection.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ struct response;
1919
classrequest_options;
2020

2121
structclient_connection {
22-
typedef function<void(iterator_range<charconst *>const &,
23-
system::error_codeconst &)>
24-
callback_type;
22+
typedef boost::function<
23+
void(boost::iterator_range<charconst *>const &,
24+
boost::system::error_codeconst &)>
25+
callback_type;
2526
virtual responsesend_request(std::stringconst & method,
2627
requestconst & request,
2728
bool get_body,

‎include/network/protocol/http/client/client_connection.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ client_connection::~client_connection() {
2121
client_connection *client_connection::clone()const {
2222
NETWORK_MESSAGE("client_connection::clone()");
2323
// For exposition only.
24-
ASSERT(false &&"This should not ever be called.");
24+
BOOST_ASSERT(false &&"This should not ever be called.");
2525
return0;
2626
}
2727

0 commit comments

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