diff options
Diffstat (limited to 'trial/direct_bt')
| -rw-r--r-- | trial/direct_bt/dbt_base_client_server.hpp | 2 | ||||
| -rw-r--r-- | trial/direct_bt/dbt_endpoint.hpp | 2 | ||||
| -rw-r--r-- | trial/direct_bt/dbt_server01.hpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/trial/direct_bt/dbt_base_client_server.hpp b/trial/direct_bt/dbt_base_client_server.hpp index bc56b767..8c40bdf8 100644 --- a/trial/direct_bt/dbt_base_client_server.hpp +++ b/trial/direct_bt/dbt_base_client_server.hpp @@ -119,7 +119,7 @@ class BaseDBTClientServer { test_timeout = timeout; resetStates(); if( !timeout.is_zero() ) { - timeout_timer.start(timeout, jau::bindMemberFunc(this, &BaseDBTClientServer::timeout_func)); + timeout_timer.start(timeout, jau::bind_member(this, &BaseDBTClientServer::timeout_func)); } } diff --git a/trial/direct_bt/dbt_endpoint.hpp b/trial/direct_bt/dbt_endpoint.hpp index 129fdd8a..10e013dd 100644 --- a/trial/direct_bt/dbt_endpoint.hpp +++ b/trial/direct_bt/dbt_endpoint.hpp @@ -125,7 +125,7 @@ class DBTEndpoint { static ChangedAdapterSetCallback initChangedAdapterSetListener(const BTManagerRef& manager, std::vector<DBTEndpointRef> endpts) { const std::lock_guard<std::mutex> lock(mtx_cas_endpts); // RAII-style acquire and relinquish via destructor cas_endpts = std::move( endpts ); - ChangedAdapterSetCallback casc = jau::bindFreeFunc(&DBTEndpoint::myChangedAdapterSetFunc); + ChangedAdapterSetCallback casc = jau::bind_free(&DBTEndpoint::myChangedAdapterSetFunc); manager->addChangedAdapterSetCallback(casc); for(DBTEndpointRef endpt : cas_endpts ) { REQUIRE( nullptr != endpt->getAdapter() ); diff --git a/trial/direct_bt/dbt_server01.hpp b/trial/direct_bt/dbt_server01.hpp index 11a3d027..fef090c6 100644 --- a/trial/direct_bt/dbt_server01.hpp +++ b/trial/direct_bt/dbt_server01.hpp @@ -413,9 +413,9 @@ class DBTServer01 : public DBTServerTest { MyGATTServerListener(DBTServer01& p) : parent(p), pulse_service("MyGATTServerListener::pulse", THREAD_SHUTDOWN_TIMEOUT_MS, - jau::bindMemberFunc(this, &MyGATTServerListener::pulse_worker), - jau::bindMemberFunc(this, &MyGATTServerListener::pulse_worker_init), - jau::bindMemberFunc(this, &MyGATTServerListener::pulse_worker_end)) + jau::bind_member(this, &MyGATTServerListener::pulse_worker), + jau::bind_member(this, &MyGATTServerListener::pulse_worker_init), + jau::bind_member(this, &MyGATTServerListener::pulse_worker_end)) { pulse_service.start(); } |