Skip to content

Commit 6bff172

Browse files
deanberrisdeanberris
committed
Merge pull request #589 from glynos/update_boost_to_std
Update boost to std
2 parents e4cb9f3 + af55a2f commit 6bff172

File tree

133 files changed

+1054
-3711
lines changed

Some content is hidden

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

133 files changed

+1054
-3711
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
4747
set(Boost_USE_MULTI_THREADED ON)
4848

4949
find_package(Boost 1.57.0
50-
REQUIRED system regex date_time thread filesystem program_options chrono
51-
atomic)
50+
REQUIRED system thread filesystem program_options)
5251

5352
if (CPP-NETLIB_ENABLE_HTTPS)
5453
find_package( OpenSSL )

‎boost/network/message/directives/detail/string_value.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// (See accompanying file LICENSE_1_0.txt or copy at
77
// http://www.boost.org/LICENSE_1_0.txt)
88

9+
#include <future>
910
#include <boost/network/traits/string.hpp>
1011
#include <boost/network/support/is_async.hpp>
1112
#include <boost/network/support/is_sync.hpp>
12-
#include <boost/thread/future.hpp>
1313
#include <boost/type_traits/is_same.hpp>
1414
#include <boost/mpl/if.hpp>
1515
#include <boost/mpl/or.hpp>
@@ -20,7 +20,7 @@ namespace detail {
2020

2121
template <class Tag>
2222
struct string_value
23-
: mpl::if_<is_async<Tag>, boost::shared_future<typename string<Tag>::type>,
23+
: mpl::if_<is_async<Tag>, std::shared_future<typename string<Tag>::type>,
2424
typename mpl::if_<
2525
mpl::or_<is_sync<Tag>, is_same<Tag, tags::default_string>,
2626
is_same<Tag, tags::default_wstring> >,

‎boost/network/message/directives/header.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <boost/network/support/is_async.hpp>
1111
#include <boost/network/traits/string.hpp>
1212
#include <boost/utility/enable_if.hpp>
13-
#include <boost/thread/future.hpp>
1413
#include <boost/mpl/if.hpp>
1514
#include <boost/mpl/or.hpp>
1615
#include <boost/variant/apply_visitor.hpp>
@@ -50,7 +49,7 @@ struct header_directive {
5049

5150
template <class Message>
5251
struct directive_impl
53-
: mpl::if_<is_base_of<tags::pod, typename Message::tag>,
52+
: mpl::if_<std::is_base_of<tags::pod, typename Message::tag>,
5453
pod_directive<Message>, normal_directive<Message> >::type {};
5554

5655
template <class Message>

‎boost/network/message/modifiers/body.hpp

Lines changed: 0 additions & 1 deletion
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/network/support/pod_or_normal.hpp>
10-
#include <boost/thread/future.hpp>
1110

1211
namespace boost {
1312
namespace network {

‎boost/network/message/modifiers/clear_headers.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// (See accompanying file LICENSE_1_0.txt or copy at
77
// http://www.boost.org/LICENSE_1_0.txt)
88

9+
#include <future>
910
#include <boost/mpl/and.hpp>
1011
#include <boost/mpl/not.hpp>
1112
#include <boost/network/support/is_async.hpp>
1213
#include <boost/network/support/is_pod.hpp>
13-
#include <boost/thread/future.hpp>
1414
#include <boost/utility/enable_if.hpp>
1515

1616
namespace boost {
@@ -34,8 +34,8 @@ template <class Message, class Tag>
3434
inline typename enable_if<mpl::and_<mpl::not_<is_pod<Tag> >, is_async<Tag> >,
3535
void>::type
3636
clear_headers(Message const &message, Tag const &) {
37-
boost::promise<typename Message::headers_container_type> header_promise;
38-
boost::shared_future<typename Message::headers_container_type> headers_future(
37+
std::promise<typename Message::headers_container_type> header_promise;
38+
std::shared_future<typename Message::headers_container_type> headers_future(
3939
header_promise.get_future());
4040
message.headers(headers_future);
4141
header_promise.set_value(typename Message::headers_container_type());

‎boost/network/message/modifiers/destination.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// http://www.boost.org/LICENSE_1_0.txt)
99

1010
#include <boost/network/support/is_async.hpp>
11-
#include <boost/thread/future.hpp>
1211

1312
namespace boost {
1413
namespace network {

‎boost/network/message/traits/body.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
// (See accompanying file LICENSE_1_0.txt or copy at
99
// http://www.boost.org/LICENSE_1_0.txt)
1010

11+
#include <future>
1112
#include <boost/mpl/if.hpp>
1213
#include <boost/network/support/is_async.hpp>
1314
#include <boost/network/support/is_sync.hpp>
1415
#include <boost/network/tags.hpp>
1516
#include <boost/network/traits/string.hpp>
16-
#include <boost/thread/future.hpp>
1717
#include <boost/type_traits/is_same.hpp>
1818

1919
namespace boost {
@@ -27,7 +27,7 @@ template <class Message>
2727
struct body
2828
: mpl::if_<
2929
is_async<typename Message::tag>,
30-
shared_future<typename string<typename Message::tag>::type>,
30+
std::shared_future<typename string<typename Message::tag>::type>,
3131
typename mpl::if_<
3232
mpl::or_<is_sync<typename Message::tag>,
3333
is_same<typename Message::tag,

‎boost/network/message/traits/destination.hpp

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

10+
#include <future>
1011
#include <boost/mpl/if.hpp>
1112
#include <boost/network/support/is_async.hpp>
1213
#include <boost/network/support/is_sync.hpp>
1314
#include <boost/network/tags.hpp>
1415
#include <boost/network/traits/string.hpp>
15-
#include <boost/thread/future.hpp>
1616
#include <boost/type_traits/is_same.hpp>
1717

1818
namespace boost {
@@ -26,7 +26,7 @@ struct unsupported_tag;
2626
template <class Message>
2727
struct destination
2828
: mpl::if_<is_async<typename Message::tag>,
29-
shared_future<typename string<typename Message::tag>::type>,
29+
std::shared_future<typename string<typename Message::tag>::type>,
3030
typename mpl::if_<
3131
mpl::or_<is_sync<typename Message::tag>,
3232
is_same<typename Message::tag,

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

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

10+
#include <future>
1011
#include <boost/mpl/if.hpp>
1112
#include <boost/mpl/or.hpp>
1213
#include <boost/network/message/directives.hpp>
@@ -27,7 +28,7 @@ template <class Message>
2728
struct header_key
2829
: mpl::if_<
2930
is_async<typename Message::tag>,
30-
boost::shared_future<typename string<typename Message::tag>::type>,
31+
std::shared_future<typename string<typename Message::tag>::type>,
3132
typename mpl::if_<
3233
mpl::or_<is_sync<typename Message::tag>,
3334
is_same<typename Message::tag, tags::default_string>,
@@ -39,7 +40,7 @@ template <class Message>
3940
struct header_value
4041
: mpl::if_<
4142
is_async<typename Message::tag>,
42-
boost::shared_future<typename string<typename Message::tag>::type>,
43+
std::shared_future<typename string<typename Message::tag>::type>,
4344
typename mpl::if_<
4445
mpl::or_<is_sync<typename Message::tag>,
4546
is_same<typename Message::tag, tags::default_string>,

‎boost/network/message/traits/source.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
// (See accompanying file LICENSE_1_0.txt or copy at
77
// http://www.boost.org/LICENSE_1_0.txt)
88

9+
#include <future>
910
#include <boost/mpl/if.hpp>
1011
#include <boost/network/support/is_async.hpp>
1112
#include <boost/network/support/is_sync.hpp>
1213
#include <boost/network/tags.hpp>
1314
#include <boost/network/traits/string.hpp>
14-
#include <boost/thread/future.hpp>
1515
#include <boost/type_traits/is_same.hpp>
1616

1717
namespace boost {
@@ -24,7 +24,7 @@ struct unsupported_tag;
2424
template <class Message>
2525
struct source
2626
: mpl::if_<is_async<typename Message::tag>,
27-
shared_future<typename string<typename Message::tag>::type>,
27+
std::shared_future<typename string<typename Message::tag>::type>,
2828
typename mpl::if_<
2929
mpl::or_<is_sync<typename Message::tag>,
3030
is_same<typename Message::tag,

0 commit comments

Comments
 (0)