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

@@ -64,12 +64,12 @@ void PVField::setImmutable() {immutable = true;}
void PVField::postPut()
{
if(postHandler.get()!=NULL) postHandler->postPut();
if(postHandler) postHandler->postPut();
}
void PVField::setPostHandler(PostHandlerPtr const &handler)
{
if(postHandler.get()!=NULL) {
if(postHandler) {
if(postHandler.get()==handler.get()) return;
throw std::logic_error(
"PVField::setPostHandler a postHandler is already registered");

View File

@@ -76,14 +76,14 @@ void PVStructureArray::compress() {
size_t newLength = 0;
for(size_t i=0; i<length; i++) {
if(vec[i].get()!=NULL) {
if(vec[i]) {
newLength++;
continue;
}
// find first non 0
size_t notNull = 0;
for(size_t j=i+1;j<length;j++) {
if(vec[j].get()!=NULL) {
if(vec[j]) {
notNull = j;
break;
}

View File

@@ -76,14 +76,14 @@ void PVUnionArray::compress() {
size_t newLength = 0;
for(size_t i=0; i<length; i++) {
if(vec[i].get()!=NULL) {
if(vec[i]) {
newLength++;
continue;
}
// find first non 0
size_t notNull = 0;
for(size_t j=i+1;j<length;j++) {
if(vec[j].get()!=NULL) {
if(vec[j]) {
notNull = j;
break;
}

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();
}
{

View File

@@ -30,14 +30,14 @@ bool PVTimeStamp::attach(PVFieldPtr const & pvField)
PVStructure* pvStructure = xxx.get();
while(true) {
PVLongPtr pvLong = pvStructure->getSubField<PVLong>("secondsPastEpoch");
if(pvLong.get()!=NULL) {
if(pvLong) {
pvSecs = pvLong;
pvNano = pvStructure->getSubField<PVInt>("nanoseconds");
pvUserTag = pvStructure->getSubField<PVInt>("userTag");
}
if(pvSecs.get()!=NULL
&& pvNano.get()!=NULL
&& pvUserTag.get()!=NULL) return true;
if(pvSecs
&& pvNano
&& pvUserTag) return true;
detach();
// look up the tree for a timeSyamp
pvStructure = pvStructure->getParent();