From 7e8c49f0a0b2ba74ff3841b76b917c5d62ff100b Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 12 Feb 2018 14:25:43 -0800
Subject: [PATCH] don't use shared_ptr::get() for null test

unnecesarily verbose
---
 src/factory/PVField.cpp          | 4 ++--
 src/factory/PVStructureArray.cpp | 4 ++--
 src/factory/PVUnionArray.cpp     | 4 ++--
 src/misc/timer.cpp               | 8 ++++----
 src/property/pvTimeStamp.cpp     | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/factory/PVField.cpp b/src/factory/PVField.cpp
index 4b239ad..bd9a491 100644
--- a/src/factory/PVField.cpp
+++ b/src/factory/PVField.cpp
@@ -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");
diff --git a/src/factory/PVStructureArray.cpp b/src/factory/PVStructureArray.cpp
index 45ed908..ea8a2a1 100644
--- a/src/factory/PVStructureArray.cpp
+++ b/src/factory/PVStructureArray.cpp
@@ -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;
             }
diff --git a/src/factory/PVUnionArray.cpp b/src/factory/PVUnionArray.cpp
index f28fdec..5bb79a0 100644
--- a/src/factory/PVUnionArray.cpp
+++ b/src/factory/PVUnionArray.cpp
@@ -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;
             }
diff --git a/src/misc/timer.cpp b/src/misc/timer.cpp
index 0d197db..28f5686 100644
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -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();
          }
          {
diff --git a/src/property/pvTimeStamp.cpp b/src/property/pvTimeStamp.cpp
index ec1c992..646aae0 100644
--- a/src/property/pvTimeStamp.cpp
+++ b/src/property/pvTimeStamp.cpp
@@ -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();