diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 565969c5c..7226f39bf 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -261,33 +261,26 @@ typedef otPtr otBufferPtr; typedef otPtr otStringPtr; Interpreter::Interpreter(Instance *aInstance) - : -#if OPENTHREAD_ENABLE_APPLICATION_COAP - mCoap(*this) - , -#endif - mUserCommands(NULL) + : mUserCommands(NULL) , mUserCommandsLength(0) , mServer(NULL) - , #ifdef OTDLL - mApiInstance(otApiInit()) + , mApiInstance(otApiInit()) , mInstanceIndex(0) - , #else - mLength(8) + , mLength(8) , mCount(1) , mInterval(1000) , mPingTimer(*aInstance, &Interpreter::s_HandlePingTimer, this) - , #if OPENTHREAD_ENABLE_DNS_CLIENT - mResolvingInProgress(0) - , + , mResolvingInProgress(0) #endif - mUdp(*this) - , + , mUdp(*this) +#endif + , mInstance(aInstance) +#if OPENTHREAD_ENABLE_APPLICATION_COAP + , mCoap(*this) #endif - mInstance(aInstance) { #ifdef OTDLL assert(mApiInstance); diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp index 930970417..38f5e980b 100644 --- a/src/cli/cli.hpp +++ b/src/cli/cli.hpp @@ -379,12 +379,6 @@ private: static Interpreter &GetOwner(OwnerLocator &aOwnerLocator); -#if OPENTHREAD_ENABLE_APPLICATION_COAP - - Coap mCoap; - -#endif // OPENTHREAD_ENABLE_APPLICATION_COAP - static const struct Command sCommands[]; const otCliCommand * mUserCommands; uint8_t mUserCommandsLength; @@ -431,6 +425,12 @@ private: #endif Instance *mInstance; + +#if OPENTHREAD_ENABLE_APPLICATION_COAP + + Coap mCoap; + +#endif // OPENTHREAD_ENABLE_APPLICATION_COAP }; } // namespace Cli diff --git a/src/core/common/instance.cpp b/src/core/common/instance.cpp index 12f76e0ee..d3acacd07 100644 --- a/src/core/common/instance.cpp +++ b/src/core/common/instance.cpp @@ -57,35 +57,27 @@ Instance::Instance(void) , mEnergyScanCallbackContext(NULL) , mNotifier(*this) , mTimerMilliScheduler(*this) - , #if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER - mTimerMicroScheduler(*this) - , + , mTimerMicroScheduler(*this) #endif - mIp6(*this) + , mIp6(*this) , mThreadNetif(*this) - , #if OPENTHREAD_ENABLE_RAW_LINK_API - mLinkRaw(*this) - , + , mLinkRaw(*this) #endif #if OPENTHREAD_ENABLE_APPLICATION_COAP - mApplicationCoap(*this) - , + , mApplicationCoap(*this) #endif #if OPENTHREAD_CONFIG_ENABLE_DYNAMIC_LOG_LEVEL - mLogLevel(static_cast(OPENTHREAD_CONFIG_LOG_LEVEL)) - , + , mLogLevel(static_cast(OPENTHREAD_CONFIG_LOG_LEVEL)) #endif #if OPENTHREAD_ENABLE_CHANNEL_MONITOR - mChannelMonitor(*this) - , + , mChannelMonitor(*this) #endif #if OPENTHREAD_ENABLE_CHANNEL_MANAGER - mChannelManager(*this) - , + , mChannelManager(*this) #endif - mMessagePool(*this) + , mMessagePool(*this) , mIsInitialized(false) { } diff --git a/src/core/common/trickle_timer.cpp b/src/core/common/trickle_timer.cpp index 37d516b13..db14fe657 100644 --- a/src/core/common/trickle_timer.cpp +++ b/src/core/common/trickle_timer.cpp @@ -48,13 +48,11 @@ TrickleTimer::TrickleTimer(Instance &aInstance, Handler aIntervalExpiredHandler, void * aOwner) : TimerMilli(aInstance, HandleTimerFired, aOwner) - , #ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT - k(aRedundancyConstant) + , k(aRedundancyConstant) , c(0) - , #endif - Imin(0) + , Imin(0) , Imax(0) , mMode(kModeNormal) , I(0) diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index 800cf5b6d..212f8a931 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -84,12 +84,10 @@ Mac::Mac(Instance &aInstance) , mPendingWaitingForData(false) , mRxOnWhenIdle(false) , mBeaconsEnabled(false) - , #if OPENTHREAD_CONFIG_STAY_AWAKE_BETWEEN_FRAGMENTS - mDelaySleep(false) - , + , mDelaySleep(false) #endif - mOperationTask(aInstance, &Mac::PerformOperation, this) + , mOperationTask(aInstance, &Mac::PerformOperation, this) , mMacTimer(aInstance, &Mac::HandleMacTimer, this) , mBackoffTimer(aInstance, &Mac::HandleBackoffTimer, this) , mReceiveTimer(aInstance, &Mac::HandleReceiveTimer, this) @@ -113,12 +111,10 @@ Mac::Mac(Instance &aInstance) , // Initialize `mActiveScanHandler` and `mEnergyScanHandler` union mPcapCallback(NULL) , mPcapCallbackContext(NULL) - , #if OPENTHREAD_ENABLE_MAC_FILTER - mFilter() - , + , mFilter() #endif // OPENTHREAD_ENABLE_MAC_FILTER - mTxFrame(static_cast(otPlatRadioGetTransmitBuffer(&aInstance))) + , mTxFrame(static_cast(otPlatRadioGetTransmitBuffer(&aInstance))) , mOobFrame(NULL) , mKeyIdMode2FrameCounter(0) , mCcaSuccessRateTracker() diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 3d814bf28..8a4fd7ea0 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -78,16 +78,14 @@ MeshForwarder::MeshForwarder(Instance &aInstance) , mRestoreChannel(0) , mRestorePanId(Mac::kPanIdBroadcast) , mScanning(false) - , #if OPENTHREAD_FTD - mSourceMatchController(aInstance) + , mSourceMatchController(aInstance) , mSendMessageFrameCounter(0) , mSendMessageKeyId(0) , mSendMessageDataSequenceNumber(0) , mStartChildIndex(0) - , #endif - mDataPollManager(aInstance) + , mDataPollManager(aInstance) { mFragTag = static_cast(otPlatRandomGet()); GetNetif().GetMac().RegisterReceiver(mMacReceiver); diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index ce6e9601f..488bfb94f 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -92,20 +92,17 @@ Mle::Mle(Instance &aInstance) , mDiscoverContext(NULL) , mIsDiscoverInProgress(false) , mEnableEui64Filtering(false) - , #if OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH - mPreviousParentRloc(Mac::kShortAddrInvalid) - , + , mPreviousParentRloc(Mac::kShortAddrInvalid) #endif #if OPENTHREAD_CONFIG_ENABLE_PERIODIC_PARENT_SEARCH - mParentSearchIsInBackoff(false) + , mParentSearchIsInBackoff(false) , mParentSearchBackoffWasCanceled(false) , mParentSearchRecentlyDetached(false) , mParentSearchBackoffCancelTime(0) , mParentSearchTimer(aInstance, &Mle::HandleParentSearchTimer, this) - , #endif - mAnnounceChannel(OT_RADIO_CHANNEL_MIN) + , mAnnounceChannel(OT_RADIO_CHANNEL_MIN) , mPreviousChannel(0) , mPreviousPanId(Mac::kPanIdBroadcast) , mNotifierCallback(&Mle::HandleStateChanged, this) diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index 1cb6cfd02..07b6cdf78 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -71,67 +71,52 @@ static const otMasterKey kThreadMasterKey = {{ ThreadNetif::ThreadNetif(Instance &aInstance) : Netif(aInstance, OT_NETIF_INTERFACE_ID_THREAD) , mCoap(aInstance) - , #if OPENTHREAD_ENABLE_DHCP6_CLIENT - mDhcp6Client(aInstance) - , + , mDhcp6Client(aInstance) #endif // OPENTHREAD_ENABLE_DHCP6_CLIENT #if OPENTHREAD_ENABLE_DHCP6_SERVER - mDhcp6Server(aInstance) - , + , mDhcp6Server(aInstance) #endif // OPENTHREAD_ENABLE_DHCP6_SERVER #if OPENTHREAD_ENABLE_DNS_CLIENT - mDnsClient(aInstance.GetThreadNetif()) - , + , mDnsClient(aInstance.GetThreadNetif()) #endif // OPENTHREAD_ENABLE_DNS_CLIENT - mActiveDataset(aInstance) + , mActiveDataset(aInstance) , mPendingDataset(aInstance) , mKeyManager(aInstance) , mLowpan(aInstance) , mMac(aInstance) , mMeshForwarder(aInstance) , mMleRouter(aInstance) - , #if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE - mNetworkDataLocal(aInstance) - , + , mNetworkDataLocal(aInstance) #endif - mNetworkDataLeader(aInstance) - , + , mNetworkDataLeader(aInstance) #if OPENTHREAD_FTD || OPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC - mNetworkDiagnostic(aInstance) - , + , mNetworkDiagnostic(aInstance) #endif - mIsUp(false) - , + , mIsUp(false) #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD - mCommissioner(aInstance) - , + , mCommissioner(aInstance) #endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD #if OPENTHREAD_ENABLE_DTLS - mDtls(aInstance) + , mDtls(aInstance) , mCoapSecure(aInstance) - , #endif #if OPENTHREAD_ENABLE_JOINER - mJoiner(aInstance) - , + , mJoiner(aInstance) #endif // OPENTHREAD_ENABLE_JOINER #if OPENTHREAD_ENABLE_JAM_DETECTION - mJamDetector(aInstance) - , + , mJamDetector(aInstance) #endif // OPENTHREAD_ENABLE_JAM_DETECTTION #if OPENTHREAD_FTD #if OPENTHREAD_ENABLE_TMF_PROXY - mTmfProxy(mMleRouter.GetMeshLocal16(), mCoap) - , + , mTmfProxy(mMleRouter.GetMeshLocal16(), mCoap) #endif // OPENTHREAD_ENABLE_TMF_PROXY - mJoinerRouter(aInstance) + , mJoinerRouter(aInstance) , mLeader(aInstance) , mAddressResolver(aInstance) - , #endif // OPENTHREAD_FTD - mChildSupervisor(aInstance) + , mChildSupervisor(aInstance) , mSupervisionListener(aInstance) , mAnnounceBegin(aInstance) , mPanIdQuery(aInstance)