STYLE: simplify short-circuit involving autoPtr (#1775)

- with '&&' conditions, often better to check for non-null autoPtr
  first (it is cheap)

- check as bool instead of valid() method for cleaner code, especially
  when the wrapped item itself has a valid/empty or good.
  Also when handling multiple checks.

  Now
      if (ptr && ptr->valid())
      if (ptr1 || ptr2)

  instead
      if (ptr.valid() && ptr->valid())
      if (ptr1.valid() || ptr2.valid())
This commit is contained in:
Mark Olesen
2020-07-15 08:50:57 +02:00
parent 3baebcb101
commit 9af3f85cf9
35 changed files with 118 additions and 123 deletions

View File

@ -370,7 +370,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues
Field<Type> values(getFieldValues<Type>(fieldName, true));
// Write raw values on surface if specified
if (surfaceWriterPtr_.valid() && surfaceWriterPtr_->enabled())
if (surfaceWriterPtr_ && surfaceWriterPtr_->enabled())
{
Field<Type> allValues(values);
combineFields(allValues);