8000 Removed boost::bind usage from metadata_change_handler.hpp. · jchjava/rethinkdb@9f9de6d · GitHub
[go: up one dir, main page]

Skip to content

Commit 9f9de6d

Browse files
committed
Removed boost::bind usage from metadata_change_handler.hpp.
1 parent a0ce578 commit 9f9de6d

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/clustering/administration/metadata_change_handler.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class metadata_change_handler_t {
2323
const boost::shared_ptr<semilattice_readwrite_view_t<metadata_t> > &_metadata) :
2424
mailbox_manager(_mailbox_manager),
2525
request_mailbox(mailbox_manager,
26-
boost::bind(&metadata_change_handler_t<metadata_t>::remote_change_request, this, _1)),
26+
std::bind(&metadata_change_handler_t<metadata_t>::remote_change_request, this, std::placeholders::_1)),
2727
metadata_view(_metadata)
2828
{ }
2929

@@ -59,8 +59,8 @@ class metadata_change_handler_t {
5959
{
6060
cond_t done;
6161
ack_mailbox_t ack_mailbox(mailbox_manager,
62-
boost::bind(&metadata_change_handler_t::metadata_change_request_t::handle_ack,
63-
this, &done, _1, _2));
62+
std::bind(&metadata_change_handler_t::metadata_change_request_t::handle_ack,
63+
this, &done, std::placeholders::_1, std::placeholders::_2));
6464

6565
send(mailbox_manager, _request_mailbox, ack_mailbox.get_address());
6666
disconnect_watcher_t dc_watcher(mailbox_manager->get_connectivity_service(), _request_mailbox.get_peer());
@@ -86,8 +86,8 @@ class metadata_change_handler_t {
8686
interest_acquired = false;
8787
promise_t<bool> result_promise;
8888
result_mailbox_t result_mailbox(mailbox_manager,
89-
boost::bind(&promise_t<bool>::pulse,
90-
&result_promise, _1));
89+
std::bind(&promise_t<bool>::pulse,
90+
&result_promise, std::placeholders::_1));
9191

9292
send(mailbox_manager, commit_mailbox_address, true, metadata, result_mailbox.get_address());
9393
disconnect_watcher_t dc_watcher(mailbox_manager->get_connectivity_service(), commit_mailbox_address.get_peer());
@@ -125,19 +125,19 @@ class metadata_change_handler_t {
125125

126126
void remote_change_request(typename ack_mailbox_t::address_t ack_mailbox) {
127127
// Spawn a coroutine to wait for the metadata change
128-
coro_t::spawn_sometime(boost::bind(&metadata_change_handler_t::remote_change_request_coro,
129-
this,
130-
ack_mailbox,
131-
auto_drainer_t::lock_t(&drainer)));
128+
coro_t::spawn_sometime(std::bind(&metadata_change_handler_t::remote_change_request_coro,
129+
this,
130+
ack_mailbox,
131+
auto_drainer_t::lock_t(&drainer)));
132132
}
133133

134134
void remote_change_request_coro(typename ack_mailbox_t::address_t ack_mailbox,
135135
auto_drainer_t::lock_t lock UNUSED) {
136136
cond_t invalid_condition;
137137
cond_t commit_done;
138138
commit_mailbox_t commit_mailbox(mailbox_manager,
139-
boost::bind(&metadata_change_handler_t<metadata_t>::handle_commit,
140-
this, &commit_done, &invalid_condition, _1, _2, _3));
139+
std::bind(&metadata_change_handler_t<metadata_t>::handle_commit,
140+
this, &commit_done, &invalid_condition, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
141141

142142
coro_invalid_conditions.insert(&invalid_condition);
143143

@@ -161,11 +161,11 @@ class metadata_change_handler_t {
161161
if (success) {
162162
update(metadata);
163163
}
164-
coro_t::spawn_sometime(boost::bind(&metadata_change_handler_t::send_result,
165-
this,
166-
success,
167-
result_mailbox,
168-
auto_drainer_t::lock_t(&drainer)));
164+
coro_t::spawn_sometime(std::bind(&metadata_change_handler_t::send_result,
165+
this,
166+
success,
167+
result_mailbox,
168+
auto_drainer_t::lock_t(&drainer)));
169169
}
170170
done->pulse();
171171
}

0 commit comments

Comments
 (0)
0