From 99a42ccadcf00a82603c6b418bb5f9a3a0aae2e4 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Fri, 5 Jun 2020 12:24:28 -0700 Subject: [PATCH] [timer] use function reference (instead of pointer) as timer handler (#5050) --- src/cli/cli.cpp | 2 +- src/core/coap/coap.cpp | 4 ++-- src/core/common/timer.hpp | 4 ++-- src/core/common/trickle_timer.cpp | 2 +- src/core/mac/data_poll_sender.cpp | 2 +- src/core/mac/mac.cpp | 2 +- src/core/mac/sub_mac.cpp | 2 +- src/core/meshcop/dataset_manager.cpp | 6 +++--- src/core/meshcop/dtls.cpp | 2 +- src/core/meshcop/joiner.cpp | 2 +- src/core/meshcop/joiner_router.cpp | 2 +- src/core/net/dhcp6_client.cpp | 2 +- src/core/net/dns_client.cpp | 2 +- src/core/net/ip6.cpp | 2 +- src/core/net/ip6_mpl.cpp | 4 ++-- src/core/net/sntp_client.cpp | 2 +- src/core/thread/address_resolver.cpp | 2 +- src/core/thread/announce_begin_server.cpp | 2 +- src/core/thread/announce_sender.cpp | 2 +- src/core/thread/energy_scan_server.cpp | 2 +- src/core/thread/key_manager.cpp | 2 +- src/core/thread/mesh_forwarder.cpp | 4 ++-- src/core/thread/mle.cpp | 8 ++++---- src/core/thread/mle_router.cpp | 4 ++-- src/core/thread/network_data_leader_ftd.cpp | 2 +- src/core/thread/network_data_notifier.cpp | 2 +- src/core/thread/panid_query_server.cpp | 2 +- src/core/utils/channel_manager.cpp | 2 +- src/core/utils/channel_monitor.cpp | 2 +- src/core/utils/child_supervision.cpp | 4 ++-- src/core/utils/jam_detector.cpp | 2 +- 31 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 144f366d6..e31c8be39 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -253,7 +253,7 @@ Interpreter::Interpreter(Instance *aInstance) , mPingHopLimit(0) , mPingAllowZeroHopLimit(false) , mPingIdentifier(0) - , mPingTimer(*aInstance, &Interpreter::HandlePingTimer, this) + , mPingTimer(*aInstance, Interpreter::HandlePingTimer, this) #if OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE , mResolvingInProgress(0) #endif diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index a9361a23e..42e20c186 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -50,7 +50,7 @@ CoapBase::CoapBase(Instance &aInstance, Sender aSender) : InstanceLocator(aInstance) , mPendingRequests() , mMessageId(Random::NonCrypto::GetUint16()) - , mRetransmissionTimer(aInstance, &Coap::HandleRetransmissionTimer, this) + , mRetransmissionTimer(aInstance, Coap::HandleRetransmissionTimer, this) , mResources() , mContext(NULL) , mInterceptor(NULL) @@ -786,7 +786,7 @@ int CoapBase::Metadata::UpdateIn(Message &aMessage) const ResponsesQueue::ResponsesQueue(Instance &aInstance) : mQueue() - , mTimer(aInstance, &ResponsesQueue::HandleTimer, this) + , mTimer(aInstance, ResponsesQueue::HandleTimer, this) { } diff --git a/src/core/common/timer.hpp b/src/core/common/timer.hpp index 8e71999a7..d60c5bd7e 100644 --- a/src/core/common/timer.hpp +++ b/src/core/common/timer.hpp @@ -80,12 +80,12 @@ public: static const uint32_t kMaxDelay = (Time::kMaxDuration >> 1); /** - * This function pointer is called when the timer expires. + * This type defines a function reference which is invoked when the timer expires. * * @param[in] aTimer A reference to the expired timer instance. * */ - typedef void (*Handler)(Timer &aTimer); + typedef void (&Handler)(Timer &aTimer); /** * This constructor creates a timer instance. diff --git a/src/core/common/trickle_timer.cpp b/src/core/common/trickle_timer.cpp index bbd67d48b..aed66a0d3 100644 --- a/src/core/common/trickle_timer.cpp +++ b/src/core/common/trickle_timer.cpp @@ -46,7 +46,7 @@ TrickleTimer::TrickleTimer(Instance &aInstance, Handler aTransmitHandler, Handler aIntervalExpiredHandler, void * aOwner) - : TimerMilli(aInstance, &TrickleTimer::HandleTimer, aOwner) + : TimerMilli(aInstance, TrickleTimer::HandleTimer, aOwner) #ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT , mRedundancyConstant(aRedundancyConstant) , mCounter(0) diff --git a/src/core/mac/data_poll_sender.cpp b/src/core/mac/data_poll_sender.cpp index 2fa5885e6..25b1f2662 100644 --- a/src/core/mac/data_poll_sender.cpp +++ b/src/core/mac/data_poll_sender.cpp @@ -52,7 +52,7 @@ DataPollSender::DataPollSender(Instance &aInstance) , mPollPeriod(0) , mExternalPollPeriod(0) , mFastPollsUsers(0) - , mTimer(aInstance, &DataPollSender::HandlePollTimer, this) + , mTimer(aInstance, DataPollSender::HandlePollTimer, this) , mEnabled(false) , mAttachMode(false) , mRetxMode(false) diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index 5760ebac2..dcd849b36 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -116,7 +116,7 @@ Mac::Mac(Instance &aInstance) , mScanHandlerContext(NULL) , mSubMac(aInstance) , mOperationTask(aInstance, &Mac::HandleOperationTask, this) - , mTimer(aInstance, &Mac::HandleTimer, this) + , mTimer(aInstance, Mac::HandleTimer, this) , mOobFrame(NULL) , mKeyIdMode2FrameCounter(0) , mCcaSampleCount(0) diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp index ee87c698f..61bbb084b 100644 --- a/src/core/mac/sub_mac.cpp +++ b/src/core/mac/sub_mac.cpp @@ -61,7 +61,7 @@ SubMac::SubMac(Instance &aInstance) , mPcapCallbackContext(NULL) , mFrameCounter(0) , mKeyId(0) - , mTimer(aInstance, &SubMac::HandleTimer, this) + , mTimer(aInstance, SubMac::HandleTimer, this) { mExtAddress.Clear(); mPrevKey.Clear(); diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 2c705cfb7..3657e4cee 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -707,7 +707,7 @@ ActiveDataset::ActiveDataset(Instance &aInstance) Dataset::kActive, OT_URI_PATH_ACTIVE_GET, OT_URI_PATH_ACTIVE_SET, - &ActiveDataset::HandleTimer) + ActiveDataset::HandleTimer) , mResourceGet(OT_URI_PATH_ACTIVE_GET, &ActiveDataset::HandleGet, this) #if OPENTHREAD_FTD , mResourceSet(OT_URI_PATH_ACTIVE_SET, &ActiveDataset::HandleSet, this) @@ -755,8 +755,8 @@ PendingDataset::PendingDataset(Instance &aInstance) Dataset::kPending, OT_URI_PATH_PENDING_GET, OT_URI_PATH_PENDING_SET, - &PendingDataset::HandleTimer) - , mDelayTimer(aInstance, &PendingDataset::HandleDelayTimer, this) + PendingDataset::HandleTimer) + , mDelayTimer(aInstance, PendingDataset::HandleDelayTimer, this) , mResourceGet(OT_URI_PATH_PENDING_GET, &PendingDataset::HandleGet, this) #if OPENTHREAD_FTD , mResourceSet(OT_URI_PATH_PENDING_SET, &PendingDataset::HandleSet, this) diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp index 5f731a200..e8263101e 100644 --- a/src/core/meshcop/dtls.cpp +++ b/src/core/meshcop/dtls.cpp @@ -61,7 +61,7 @@ Dtls::Dtls(Instance &aInstance, bool aLayerTwoSecurity) , mState(kStateClosed) , mPskLength(0) , mVerifyPeerCertificate(true) - , mTimer(aInstance, &Dtls::HandleTimer, this) + , mTimer(aInstance, Dtls::HandleTimer, this) , mTimerIntermediate(0) , mTimerSet(false) , mLayerTwoSecurity(aLayerTwoSecurity) diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 250d7719a..84c6e3b3b 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -62,7 +62,7 @@ Joiner::Joiner(Instance &aInstance) , mContext(NULL) , mJoinerRouterIndex(0) , mFinalizeMessage(NULL) - , mTimer(aInstance, &Joiner::HandleTimer, this) + , mTimer(aInstance, Joiner::HandleTimer, this) , mJoinerEntrust(OT_URI_PATH_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this) { memset(mJoinerRouters, 0, sizeof(mJoinerRouters)); diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index 4f9b29b9f..5a07f0b6c 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -57,7 +57,7 @@ JoinerRouter::JoinerRouter(Instance &aInstance) : InstanceLocator(aInstance) , mSocket(aInstance.Get()) , mRelayTransmit(OT_URI_PATH_RELAY_TX, &JoinerRouter::HandleRelayTransmit, this) - , mTimer(aInstance, &JoinerRouter::HandleTimer, this) + , mTimer(aInstance, JoinerRouter::HandleTimer, this) , mNotifierCallback(aInstance, &JoinerRouter::HandleStateChanged, this) , mJoinerUdpPort(0) , mIsJoinerPortConfigured(false) diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp index 26e9fd3ea..6a6da9769 100644 --- a/src/core/net/dhcp6_client.cpp +++ b/src/core/net/dhcp6_client.cpp @@ -54,7 +54,7 @@ namespace Dhcp6 { Dhcp6Client::Dhcp6Client(Instance &aInstance) : InstanceLocator(aInstance) , mSocket(Get()) - , mTrickleTimer(aInstance, &Dhcp6Client::HandleTrickleTimer, NULL, this) + , mTrickleTimer(aInstance, Dhcp6Client::HandleTrickleTimer, NULL, this) , mStartTime(0) , mIdentityAssociationCurrent(NULL) { diff --git a/src/core/net/dns_client.cpp b/src/core/net/dns_client.cpp index 9b439d06e..a58b891b1 100644 --- a/src/core/net/dns_client.cpp +++ b/src/core/net/dns_client.cpp @@ -75,7 +75,7 @@ QueryMetadata::QueryMetadata(otDnsResponseHandler aHandler, void *aContext) Client::Client(Ip6::Netif &aNetif) : mSocket(aNetif.Get()) , mMessageId(0) - , mRetransmissionTimer(aNetif.GetInstance(), &Client::HandleRetransmissionTimer, this) + , mRetransmissionTimer(aNetif.GetInstance(), Client::HandleRetransmissionTimer, this) { } diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp index 8fdd69d5a..b704a5964 100644 --- a/src/core/net/ip6.cpp +++ b/src/core/net/ip6.cpp @@ -62,7 +62,7 @@ Ip6::Ip6(Instance &aInstance) , mUdp(aInstance) , mMpl(aInstance) #if OPENTHREAD_CONFIG_IP6_FRAGMENTATION_ENABLE - , mTimer(aInstance, &Ip6::HandleTimer, this) + , mTimer(aInstance, Ip6::HandleTimer, this) #endif { } diff --git a/src/core/net/ip6_mpl.cpp b/src/core/net/ip6_mpl.cpp index 73cf7b399..73d5b34c4 100644 --- a/src/core/net/ip6_mpl.cpp +++ b/src/core/net/ip6_mpl.cpp @@ -46,11 +46,11 @@ namespace Ip6 { Mpl::Mpl(Instance &aInstance) : InstanceLocator(aInstance) , mMatchingAddress(NULL) - , mSeedSetTimer(aInstance, &Mpl::HandleSeedSetTimer, this) + , mSeedSetTimer(aInstance, Mpl::HandleSeedSetTimer, this) , mSeedId(0) , mSequence(0) #if OPENTHREAD_FTD - , mRetransmissionTimer(aInstance, &Mpl::HandleRetransmissionTimer, this) + , mRetransmissionTimer(aInstance, Mpl::HandleRetransmissionTimer, this) , mTimerExpirations(0) #endif { diff --git a/src/core/net/sntp_client.cpp b/src/core/net/sntp_client.cpp index 64b383f75..4307cd421 100644 --- a/src/core/net/sntp_client.cpp +++ b/src/core/net/sntp_client.cpp @@ -91,7 +91,7 @@ QueryMetadata::QueryMetadata(otSntpResponseHandler aHandler, void *aContext) Client::Client(Ip6::Netif &aNetif) : mSocket(aNetif.Get()) - , mRetransmissionTimer(aNetif.GetInstance(), &Client::HandleRetransmissionTimer, this) + , mRetransmissionTimer(aNetif.GetInstance(), Client::HandleRetransmissionTimer, this) , mUnixEra(0) { } diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index 26961fdc1..3df440734 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -63,7 +63,7 @@ AddressResolver::AddressResolver(Instance &aInstance) , mQueryRetryList() , mUnusedList() , mIcmpHandler(&AddressResolver::HandleIcmpReceive, this) - , mTimer(aInstance, &AddressResolver::HandleTimer, this) + , mTimer(aInstance, AddressResolver::HandleTimer, this) { for (CacheEntry *entry = &mCacheEntries[0]; entry < OT_ARRAY_END(mCacheEntries); entry++) { diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp index 33b68e718..01ce40ca7 100644 --- a/src/core/thread/announce_begin_server.cpp +++ b/src/core/thread/announce_begin_server.cpp @@ -48,7 +48,7 @@ namespace ot { AnnounceBeginServer::AnnounceBeginServer(Instance &aInstance) - : AnnounceSenderBase(aInstance, &AnnounceBeginServer::HandleTimer) + : AnnounceSenderBase(aInstance, AnnounceBeginServer::HandleTimer) , mAnnounceBegin(OT_URI_PATH_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this) { Get().AddResource(mAnnounceBegin); diff --git a/src/core/thread/announce_sender.cpp b/src/core/thread/announce_sender.cpp index d9c98d5f8..3ae445681 100644 --- a/src/core/thread/announce_sender.cpp +++ b/src/core/thread/announce_sender.cpp @@ -111,7 +111,7 @@ exit: #if OPENTHREAD_CONFIG_ANNOUNCE_SENDER_ENABLE AnnounceSender::AnnounceSender(Instance &aInstance) - : AnnounceSenderBase(aInstance, &AnnounceSender::HandleTimer) + : AnnounceSenderBase(aInstance, AnnounceSender::HandleTimer) , mNotifierCallback(aInstance, HandleStateChanged, this) { } diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp index aa6394217..6949446cc 100644 --- a/src/core/thread/energy_scan_server.cpp +++ b/src/core/thread/energy_scan_server.cpp @@ -55,7 +55,7 @@ EnergyScanServer::EnergyScanServer(Instance &aInstance) , mCount(0) , mActive(false) , mScanResultsLength(0) - , mTimer(aInstance, &EnergyScanServer::HandleTimer, this) + , mTimer(aInstance, EnergyScanServer::HandleTimer, this) , mNotifierCallback(aInstance, &EnergyScanServer::HandleStateChanged, this) , mEnergyScan(OT_URI_PATH_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this) { diff --git a/src/core/thread/key_manager.cpp b/src/core/thread/key_manager.cpp index bbbf1f738..c8e4355b4 100644 --- a/src/core/thread/key_manager.cpp +++ b/src/core/thread/key_manager.cpp @@ -76,7 +76,7 @@ KeyManager::KeyManager(Instance &aInstance) , mKeyRotationTime(kDefaultKeyRotationTime) , mKeySwitchGuardTime(kDefaultKeySwitchGuardTime) , mKeySwitchGuardEnabled(false) - , mKeyRotationTimer(aInstance, &KeyManager::HandleKeyRotationTimer, this) + , mKeyRotationTimer(aInstance, KeyManager::HandleKeyRotationTimer, this) , mKekFrameCounter(0) , mSecurityPolicyFlags(0xff) , mIsPskcSet(false) diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 7c0d732a7..7846e6327 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -57,8 +57,8 @@ namespace ot { MeshForwarder::MeshForwarder(Instance &aInstance) : InstanceLocator(aInstance) - , mDiscoverTimer(aInstance, &MeshForwarder::HandleDiscoverTimer, this) - , mUpdateTimer(aInstance, &MeshForwarder::HandleUpdateTimer, this) + , mDiscoverTimer(aInstance, MeshForwarder::HandleDiscoverTimer, this) + , mUpdateTimer(aInstance, MeshForwarder::HandleUpdateTimer, this) , mMessageNextOffset(0) , mSendMessage(NULL) , mMeshSource() diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index eb7715b0a..467526ae4 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -69,9 +69,9 @@ Mle::Mle(Instance &aInstance) , mReattachState(kReattachStop) , mAttachCounter(0) , mAnnounceDelay(kAnnounceTimeout) - , mAttachTimer(aInstance, &Mle::HandleAttachTimer, this) - , mDelayedResponseTimer(aInstance, &Mle::HandleDelayedResponseTimer, this) - , mMessageTransmissionTimer(aInstance, &Mle::HandleMessageTransmissionTimer, this) + , mAttachTimer(aInstance, Mle::HandleAttachTimer, this) + , mDelayedResponseTimer(aInstance, Mle::HandleDelayedResponseTimer, this) + , mMessageTransmissionTimer(aInstance, Mle::HandleMessageTransmissionTimer, this) , mParentLeaderCost(0) , mParentRequestMode(kAttachAny) , mParentPriority(0) @@ -102,7 +102,7 @@ Mle::Mle(Instance &aInstance) , mParentSearchBackoffWasCanceled(false) , mParentSearchRecentlyDetached(false) , mParentSearchBackoffCancelTime(0) - , mParentSearchTimer(aInstance, &Mle::HandleParentSearchTimer, this) + , mParentSearchTimer(aInstance, Mle::HandleParentSearchTimer, this) #endif , mAnnounceChannel(0) , mAlternateChannel(0) diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 4498c7d02..63e109528 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -58,8 +58,8 @@ namespace Mle { MleRouter::MleRouter(Instance &aInstance) : Mle(aInstance) - , mAdvertiseTimer(aInstance, &MleRouter::HandleAdvertiseTimer, NULL, this) - , mStateUpdateTimer(aInstance, &MleRouter::HandleStateUpdateTimer, this) + , mAdvertiseTimer(aInstance, MleRouter::HandleAdvertiseTimer, NULL, this) + , mStateUpdateTimer(aInstance, MleRouter::HandleStateUpdateTimer, this) , mAddressSolicit(OT_URI_PATH_ADDRESS_SOLICIT, &MleRouter::HandleAddressSolicit, this) , mAddressRelease(OT_URI_PATH_ADDRESS_RELEASE, &MleRouter::HandleAddressRelease, this) , mChildTable(aInstance) diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index b66d4ebe9..a5be14a84 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -57,7 +57,7 @@ namespace NetworkData { Leader::Leader(Instance &aInstance) : LeaderBase(aInstance) - , mTimer(aInstance, &Leader::HandleTimer, this) + , mTimer(aInstance, Leader::HandleTimer, this) , mServerData(OT_URI_PATH_SERVER_DATA, &Leader::HandleServerData, this) , mCommissioningDataGet(OT_URI_PATH_COMMISSIONER_GET, &Leader::HandleCommissioningGet, this) , mCommissioningDataSet(OT_URI_PATH_COMMISSIONER_SET, &Leader::HandleCommissioningSet, this) diff --git a/src/core/thread/network_data_notifier.cpp b/src/core/thread/network_data_notifier.cpp index d760b2728..3b1656932 100644 --- a/src/core/thread/network_data_notifier.cpp +++ b/src/core/thread/network_data_notifier.cpp @@ -47,7 +47,7 @@ namespace NetworkData { Notifier::Notifier(Instance &aInstance) : InstanceLocator(aInstance) , mNotifierCallback(aInstance, &Notifier::HandleStateChanged, this) - , mTimer(aInstance, &Notifier::HandleTimer, this) + , mTimer(aInstance, Notifier::HandleTimer, this) , mNextDelay(0) , mWaitingForResponse(false) { diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp index 1215a261c..ac4c72223 100644 --- a/src/core/thread/panid_query_server.cpp +++ b/src/core/thread/panid_query_server.cpp @@ -50,7 +50,7 @@ PanIdQueryServer::PanIdQueryServer(Instance &aInstance) : InstanceLocator(aInstance) , mChannelMask(0) , mPanId(Mac::kPanIdBroadcast) - , mTimer(aInstance, &PanIdQueryServer::HandleTimer, this) + , mTimer(aInstance, PanIdQueryServer::HandleTimer, this) , mPanIdQuery(OT_URI_PATH_PANID_QUERY, &PanIdQueryServer::HandleQuery, this) { Get().AddResource(mPanIdQuery); diff --git a/src/core/utils/channel_manager.cpp b/src/core/utils/channel_manager.cpp index 2ad800fde..5039f9451 100644 --- a/src/core/utils/channel_manager.cpp +++ b/src/core/utils/channel_manager.cpp @@ -55,7 +55,7 @@ ChannelManager::ChannelManager(Instance &aInstance) , mDelay(kMinimumDelay) , mChannel(0) , mState(kStateIdle) - , mTimer(aInstance, &ChannelManager::HandleTimer, this) + , mTimer(aInstance, ChannelManager::HandleTimer, this) , mAutoSelectInterval(kDefaultAutoSelectInterval) , mAutoSelectEnabled(false) { diff --git a/src/core/utils/channel_monitor.cpp b/src/core/utils/channel_monitor.cpp index d25796a67..f26d04599 100644 --- a/src/core/utils/channel_monitor.cpp +++ b/src/core/utils/channel_monitor.cpp @@ -62,7 +62,7 @@ ChannelMonitor::ChannelMonitor(Instance &aInstance) : InstanceLocator(aInstance) , mChannelMaskIndex(0) , mSampleCount(0) - , mTimer(aInstance, &ChannelMonitor::HandleTimer, this) + , mTimer(aInstance, ChannelMonitor::HandleTimer, this) { memset(mChannelOccupancy, 0, sizeof(mChannelOccupancy)); } diff --git a/src/core/utils/child_supervision.cpp b/src/core/utils/child_supervision.cpp index 5ef58b5f7..ac42212eb 100644 --- a/src/core/utils/child_supervision.cpp +++ b/src/core/utils/child_supervision.cpp @@ -50,7 +50,7 @@ namespace Utils { ChildSupervisor::ChildSupervisor(Instance &aInstance) : InstanceLocator(aInstance) , mSupervisionInterval(kDefaultSupervisionInterval) - , mTimer(aInstance, &ChildSupervisor::HandleTimer, this) + , mTimer(aInstance, ChildSupervisor::HandleTimer, this) , mNotifierCallback(aInstance, &ChildSupervisor::HandleStateChanged, this) { } @@ -180,7 +180,7 @@ void ChildSupervisor::HandleStateChanged(otChangedFlags aFlags) SupervisionListener::SupervisionListener(Instance &aInstance) : InstanceLocator(aInstance) , mTimeout(0) - , mTimer(aInstance, &SupervisionListener::HandleTimer, this) + , mTimer(aInstance, SupervisionListener::HandleTimer, this) { SetTimeout(kDefaultTimeout); } diff --git a/src/core/utils/jam_detector.cpp b/src/core/utils/jam_detector.cpp index ec1625128..99b76eb9f 100644 --- a/src/core/utils/jam_detector.cpp +++ b/src/core/utils/jam_detector.cpp @@ -50,7 +50,7 @@ JamDetector::JamDetector(Instance &aInstance) , mHandler(NULL) , mContext(NULL) , mNotifierCallback(aInstance, HandleStateChanged, this) - , mTimer(aInstance, &JamDetector::HandleTimer, this) + , mTimer(aInstance, JamDetector::HandleTimer, this) , mHistoryBitmap(0) , mCurSecondStartTime(0) , mSampleInterval(0)