update expiryTimer return type to void.
Change-Id: I7fc13857a09db2c567f7aaeeac46b092d6b8241a
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1733
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
const std::string&)> SubscribeCB;
typedef std::function<void(const HeaderOptions&, const ResponseStatement&, int)> RequestGetCB;
- typedef std::function<void*(long long)> TimerCB;
+ typedef std::function<void(long long)> TimerCB;
} // namespace Service
} // namespace OIC
void changeAllPresenceMode(BROKER_MODE mode);
void subscribeCB(OCStackResult ret,const unsigned int seq, const std::string& Hostaddress);
- void * timeOutCB(TimerID id);
+ void timeOutCB(TimerID id);
};
} // namespace Service
} // namespace OIC
void getCB(const HeaderOptions &hos, const ResponseStatement& rep, int eCode);
void verifiedGetResponse(int eCode);
- void * timeOutCB(unsigned int msg);
- void * pollingCB(unsigned int msg = 0);
+ void timeOutCB(unsigned int msg);
+ void pollingCB(unsigned int msg = 0);
void executeAllBrokerCB(BROKER_STATE changedState);
void setResourcestate(BROKER_STATE _state);
}
}
- void * DevicePresence::timeOutCB(TimerID id)
+ void DevicePresence::timeOutCB(TimerID id)
{
std::unique_lock<std::mutex> lock(timeoutMutex);
isRunningTimeOut = true;
isRunningTimeOut = false;
condition.notify_all();
-
- return NULL;
}
} // namespace Service
} // namespace OIC
void ResourcePresence::setResourcestate(BROKER_STATE _state)
{
this->state = _state;
-
}
- void * ResourcePresence::timeOutCB(unsigned int msg)
+ void ResourcePresence::timeOutCB(unsigned int msg)
{
std::unique_lock<std::mutex> lock(cbMutex);
isTimeoutCB = true;
isTimeoutCB = false;
cbCondition.notify_all();
- return NULL;
+ return;
}
this->isWithinTime = false;
OC_LOG_V(DEBUG, BROKER_TAG,
isTimeoutCB = false;
cbCondition.notify_all();
-
- return NULL;
}
- void * ResourcePresence::pollingCB(unsigned int msg)
+ void ResourcePresence::pollingCB(unsigned int msg)
{
OC_LOG_V(DEBUG,BROKER_TAG,"IN PollingCB\n");
this->requestResourceState();
timeoutHandle = expiryTimer.postTimer(BROKER_SAFE_MILLISECOND,pTimeoutCB);
-
- return NULL;
}
void ResourcePresence::getCB(const HeaderOptions &hos,