don't use shared_ptr::get() for null test

unnecesarily verbose
This commit is contained in:
Michael Davidsaver
2018-02-12 14:25:43 -08:00
parent f2ad6292f5
commit 7e8c49f0a0
5 changed files with 14 additions and 14 deletions

View File

@@ -48,7 +48,7 @@ void Timer::addElement(TimerCallbackPtr const & timerCallback)
TimerCallbackPtr prevNode;
while(true) {
if(timerCallback->timeToRun < nextNode->timeToRun) {
if(prevNode.get()!=NULL) {
if(prevNode) {
prevNode->next = timerCallback;
} else {
head = timerCallback;
@@ -75,7 +75,7 @@ void Timer::cancel(TimerCallbackPtr const &timerCallback)
TimerCallbackPtr prevNode;
while(true) {
if(nextNode.get()==timerCallback.get()) {
if(prevNode.get()!=NULL) {
if(prevNode) {
prevNode->next = timerCallback->next;
} else {
head = timerCallback->next;
@@ -108,7 +108,7 @@ void Timer::run()
currentTime.getCurrent();
if (!alive) break;
TimerCallbackPtr timerCallback = head;
if(timerCallback.get()!=NULL) {
if(timerCallback) {
double diff = TimeStamp::diff(
timerCallback->timeToRun,currentTime);
if(diff<=0.0) {
@@ -124,7 +124,7 @@ void Timer::run()
}
}
}
if(nodeToCall.get()!=NULL) {
if(nodeToCall) {
nodeToCall->callback();
}
{