From c5630e5cb1b404323a28a5140bed30f1cff70c73 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 8 Aug 2016 15:38:53 +0100
Subject: [PATCH] Corrected nullptr collateral damage Resolves bug-report
http://bugs.openfoam.org/view.php?id=2181
---
.../unv/block_with_inlet_outlet.UNV | 24 +++++++++----------
src/OSspecific/POSIX/regExp.C | 2 +-
.../HashTables/HashTable/HashTable.C | 2 +-
src/OpenFOAM/db/IOstreams/token/token.H | 2 +-
src/OpenFOAM/db/IOstreams/token/tokenI.H | 2 +-
.../functionObjectList/functionObjectList.H | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/block_with_inlet_outlet.UNV b/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/block_with_inlet_outlet.UNV
index d62033b9cec..64a2dff2964 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/block_with_inlet_outlet.UNV
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/block_with_inlet_outlet.UNV
@@ -258,84 +258,84 @@ YIELD STRESS
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
PRESSURE PASCAL
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
CONVECTIVE FILM COEFFICIENT
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
CONVECTION COEFFICIENT J/M^2/K/SEC
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
THERMAL CAPACITY PER UNIT AREA
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
THERMAL CAPACITY PER UNIT AREA J/M^2/K
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
SURFACE HEAT FLUX RATE
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
HEAT FLUX PER UNIT AREA J/M^2/SEC
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
VISCOSITY
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
VISCOSITY KG/M/SEC
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
COEFFICIENT OF FRICTION
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
AREA FACTOR
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
EMISSIVITY
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
ABSORPTIVITY
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
HEAT FLUX RATE
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
HEAT FLUX PER UNIT LENGTH J/M/SEC
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
INTERACTION TERM FOR TSAI-WU
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
SWELLING COEFFICIENT
1 VERSION NUMBER
0 LINE(S) OF TEXT
DIMENSIONS AND UNITS:
DIMENSIONLESS UNITLESS
-nullptr_PROPERTY
+NULL_PROPERTY
--------------------------------------------------------------------------------
DEFAULT MATERIAL PROPERT(IES):
MODULUS OF ELASTICITY VERSION : 1
diff --git a/src/OSspecific/POSIX/regExp.C b/src/OSspecific/POSIX/regExp.C
index f2b6c7ecf6a..0d7b6e80ed2 100644
--- a/src/OSspecific/POSIX/regExp.C
+++ b/src/OSspecific/POSIX/regExp.C
@@ -117,7 +117,7 @@ void Foam::regExp::set(const char* pattern, const bool ignoreCase) const
{
clear();
- // Avoid nullptr pointer and zero-length patterns
+ // Avoid nullptr and zero-length patterns
if (pattern && *pattern)
{
int cflags = REG_EXTENDED;
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 5da26ea5298..845bb8c4391 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -341,7 +341,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
hashTable_->table_[hashIndex_] = entryPtr_->next_;
delete entryPtr_;
- // Assign any non-nullptr pointer value so it doesn't look
+ // Assign any non-nullptr value so it doesn't look
// like end()/cend()
entryPtr_ = reinterpret_cast<hashedEntry*>(this);
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 4d97fb7f395..7229e58b862 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -94,7 +94,7 @@ public:
//- Standard punctuation tokens
enum punctuationToken
{
- nullptr_TOKEN = '\0',
+ NULL_TOKEN = '\0',
SPACE = ' ',
TAB = '\t',
NL = '\n',
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index 0ffc613d3d0..2f0383c9b25 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -206,7 +206,7 @@ inline Foam::token::punctuationToken Foam::token::pToken() const
else
{
parseError("punctuation character");
- return nullptr_TOKEN;
+ return NULL_TOKEN;
}
}
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 672ff38f970..da27e7d7f36 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -88,7 +88,7 @@ class functionObjectList
//- Remove and return the function object pointer by name,
// and returns the old index via the parameter.
- // Returns a nullptr pointer (and index -1) if it didn't exist
+ // Returns a nullptr (and index -1) if it didn't exist
functionObject* remove(const word&, label& oldIndex);
//- Search the specified directory for functionObject
--
GitLab