Skip to content

Commit 91d0a73

Browse files
deanberrisdeanberris
committed
Fully Qualify Boost Libraries
Batch 1 of changes to fully qualify boost:: namespaces now that we don't live in boost:: anymore.
1 parent c226fd5 commit 91d0a73

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
namespace network {
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
virtual void get_destination(std::string & destination) const = 0;
2828
virtual void get_source(std::string & source) const = 0;
29-
virtual void get_headers(function<void(std::string const &, std::string const &)> inserter) const = 0;
30-
virtual void get_headers(std::string const & name, function<void(std::string const &, std::string const &)> inserter) const = 0;
31-
virtual void get_headers(function<bool(std::string const &, std::string const &)> predicate, function<void(std::string const &, std::string const &)> inserter) const = 0;
29+
virtual void get_headers(boost::function<void(std::string const &, std::string const &)> inserter) const = 0;
30+
virtual void get_headers(std::string const & name, boost::function<void(std::string const &, std::string const &)> inserter) const = 0;
31+
virtual void get_headers(boost::function<bool(std::string const &, std::string const &)> predicate, boost::function<void(std::string const &, std::string const &)> inserter) const = 0;
3232
virtual void get_body(std::string & body) const = 0;
33-
virtual void get_body(function<void(iterator_range<char const *>)> chunk_reader, size_t size) const = 0;
33+
virtual void get_body(boost::function<void(boost::iterator_range<char const *>)> 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 <class M>
2121
struct Message
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_selector const &) {};
25-
friend source_selector boost::network::source_(source_selector);
25+
friend source_selector network::source_(source_selector);
2626
};
2727

2828
struct destination_selector {
2929
private:
3030
destination_selector() {};
3131
destination_selector(destination_selector const &) {};
32-
friend destination_selector boost::network::destination_(destination_selector);
32+
friend destination_selector network::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_helper const &) {}
71-
friend to_lower_placeholder_helper boost::network::to_lower_(to_lower_placeholder_helper);
71+
friend to_lower_placeholder_helper network::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_helper const &) {}
72-
friend to_upper_placeholder_helper boost::network::to_upper_(to_upper_placeholder_helper);
72+
friend to_upper_placeholder_helper network::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
explicit body_wrapper(message_base const & message);
1818
operator std::string () const;
1919
std::size_t size() const;
20-
operator iterator_range<std::string::const_iterator> () const;
20+
operator boost::iterator_range<std::string::const_iterator> () const;
2121
std::string::const_iterator begin() const;
2222
std::string::const_iterator end() const;
2323
private:
2424
message_base const & message_;
25-
mutable optional<std::string> cache_;
25+
mutable boost::optional<std::string> cache_;
2626
};
2727

2828
inline std::ostream & operator<<(std::ostream & os, body_wrapper const & 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
operator std::string () const;
1717
private:
1818
message_base const & message_;
19-
mutable optional<std::string> cache_;
19+
mutable boost::optional<std::string> cache_;
2020
};
2121

2222
inline destination_wrapper const

‎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
class request_options;
2020

2121
struct client_connection {
22-
typedef function<void(iterator_range<char const *> const &,
23-
system::error_code const &)>
24-
callback_type;
22+
typedef boost::function<
23+
void(boost::iterator_range<char const *> const &,
24+
boost::system::error_code const &)>
25+
callback_type;
2526
virtual response send_request(std::string const & method,
2627
request const & 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
return 0;
2626
}
2727

0 commit comments

Comments
 (0)