Skip to content

Commit 5d65ee4

Browse files
committed
Merge pull request google#719 from emaste/master
Add std namespace missing from one bind call.
2 parents 08707bb + 452c262 commit 5d65ee4

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Please keep the list sorted.
1010

1111
Comodo CA Limited
12+
Ed Maste <emaste@freebsd.org>
1213
Google Inc.
1314
Jeff Trawick <trawick@gmail.com>
1415
Katriel Cohn-Gordon <katriel.cohn-gordon@cybersecurity.ox.ac.uk>

CONTRIBUTORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Al Cutter <al@google.com>
2626
Ben Laurie <benl@google.com> <ben@links.org>
2727
Chris Kennelly <ckennelly@google.com> <ckennelly@ckennelly.com>
2828
Deyan Bektchiev <deyan.bektchiev@venafi.com> <deyan@bektchiev.net>
29+
Ed Maste <emaste@freebsd.org>
2930
Emilia Kasper <ekasper@google.com>
3031
Eran Messeri <eranm@google.com> <eran.mes@gmail.com>
3132
Jeff Trawick <trawick@gmail.com>

cpp/log/etcd_consistent_store-inl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,8 @@ void EtcdConsistentStore<Logged>::StartEtcdStatsFetch() {
860860
}
861861
EtcdClient::StatsResponse* response(new EtcdClient::StatsResponse);
862862
util::Task* stats_task(etcd_stats_task_.task()->AddChild(
863-
bind(&EtcdConsistentStore<Logged>::EtcdStatsFetchDone, this, response,
864-
std::placeholders::_1)));
863+
std::bind(&EtcdConsistentStore<Logged>::EtcdStatsFetchDone, this,
864+
response, std::placeholders::_1)));
865865
client_->GetStoreStats(response, stats_task);
866866
}
867867

0 commit comments

Comments
 (0)