C++11: Replaced the C NULL with the safer C++11 nullptr

Requires gcc version 4.7 or higher
This commit is contained in:
Henry Weller
2016-08-05 17:19:38 +01:00
parent 7996a9138f
commit 58f905ff70
363 changed files with 1468 additions and 1416 deletions

View File

@ -607,8 +607,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
tgtWeights_(),
tgtWeightsSum_(),
triMode_(triMode),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
update(srcPatch, tgtPatch);
}
@ -638,8 +638,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
tgtWeights_(),
tgtWeightsSum_(),
triMode_(triMode),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
update(srcPatch, tgtPatch);
}
@ -670,8 +670,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
tgtWeights_(),
tgtWeightsSum_(),
triMode_(triMode),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructFromSurface(srcPatch, tgtPatch, surfPtr);
}
@ -702,8 +702,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
tgtWeights_(),
tgtWeightsSum_(),
triMode_(triMode),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructFromSurface(srcPatch, tgtPatch, surfPtr);
}
@ -729,8 +729,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
tgtWeights_(),
tgtWeightsSum_(),
triMode_(fineAMI.triMode_),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
label sourceCoarseSize =
(

View File

@ -39,8 +39,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
:
coupledPointPatchField<Type>(p, iF),
cyclicACMIPatch_(refCast<const cyclicACMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{}
@ -54,8 +54,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
:
coupledPointPatchField<Type>(p, iF, dict),
cyclicACMIPatch_(refCast<const cyclicACMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{
if (!isType<cyclicACMIPointPatch>(p))
{
@ -80,8 +80,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
:
coupledPointPatchField<Type>(ptf, p, iF, mapper),
cyclicACMIPatch_(refCast<const cyclicACMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{
if (!isType<cyclicACMIPointPatch>(this->patch()))
{
@ -104,8 +104,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
:
coupledPointPatchField<Type>(ptf, iF),
cyclicACMIPatch_(ptf.cyclicACMIPatch_),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{}

View File

@ -39,8 +39,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
:
coupledPointPatchField<Type>(p, iF),
cyclicAMIPatch_(refCast<const cyclicAMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{}
@ -54,8 +54,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
:
coupledPointPatchField<Type>(p, iF, dict),
cyclicAMIPatch_(refCast<const cyclicAMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{
if (!isType<cyclicAMIPointPatch>(p))
{
@ -80,8 +80,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
:
coupledPointPatchField<Type>(ptf, p, iF, mapper),
cyclicAMIPatch_(refCast<const cyclicAMIPointPatch>(p)),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{
if (!isType<cyclicAMIPointPatch>(this->patch()))
{
@ -104,8 +104,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
:
coupledPointPatchField<Type>(ptf, iF),
cyclicAMIPatch_(ptf.cyclicAMIPatch_),
ppiPtr_(NULL),
nbrPpiPtr_(NULL)
ppiPtr_(nullptr),
nbrPpiPtr_(nullptr)
{}

View File

@ -490,11 +490,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
rotationAngleDefined_(false),
rotationAngle_(0.0),
separationVector_(Zero),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(false),
AMIRequireMatch_(true),
AMILowWeightCorrection_(-1.0),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{
// Neighbour patch might not be valid yet so no transformation
@ -520,11 +520,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
rotationAngleDefined_(false),
rotationAngle_(0.0),
separationVector_(Zero),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
AMIRequireMatch_(true),
AMILowWeightCorrection_(dict.lookupOrDefault("lowWeightCorrection", -1.0)),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(dict.subOrEmptyDict("surface"))
{
if (nbrPatchName_ == word::null && !coupleGroup_.valid())
@ -609,11 +609,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
rotationAngleDefined_(pp.rotationAngleDefined_),
rotationAngle_(pp.rotationAngle_),
separationVector_(pp.separationVector_),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(pp.AMIReverse_),
AMIRequireMatch_(pp.AMIRequireMatch_),
AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(pp.surfDict_)
{
// Neighbour patch might not be valid yet so no transformation
@ -640,11 +640,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
rotationAngleDefined_(pp.rotationAngleDefined_),
rotationAngle_(pp.rotationAngle_),
separationVector_(pp.separationVector_),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(pp.AMIReverse_),
AMIRequireMatch_(pp.AMIRequireMatch_),
AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(pp.surfDict_)
{
if (nbrPatchName_ == name())
@ -678,11 +678,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
rotationAngleDefined_(pp.rotationAngleDefined_),
rotationAngle_(pp.rotationAngle_),
separationVector_(pp.separationVector_),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(pp.AMIReverse_),
AMIRequireMatch_(pp.AMIRequireMatch_),
AMILowWeightCorrection_(pp.AMILowWeightCorrection_),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(pp.surfDict_)
{}

View File

@ -383,7 +383,7 @@ Foam::cellFeatures::cellFeatures
minCos_(minCos),
celli_(celli),
featureEdge_(10*mesh.cellEdges()[celli].size()),
facesPtr_(NULL),
facesPtr_(nullptr),
faceMap_(0)
{
const labelList& cEdges = mesh_.cellEdges()[celli_];

View File

@ -70,7 +70,7 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::transform
) const
{
NotImplemented;
return tmp<vectorField>(NULL);
return tmp<vectorField>(nullptr);
}
@ -80,7 +80,7 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::invTransform
) const
{
NotImplemented;
return tmp<vectorField>(NULL);
return tmp<vectorField>(nullptr);
}
@ -97,7 +97,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}
@ -117,7 +117,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}

View File

@ -71,7 +71,7 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::transform
) const
{
NotImplemented;
return tmp<vectorField>(NULL);
return tmp<vectorField>(nullptr);
}
@ -81,7 +81,7 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::invTransform
) const
{
NotImplemented;
return tmp<vectorField>(NULL);
return tmp<vectorField>(nullptr);
}
@ -98,7 +98,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}
@ -118,7 +118,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}

View File

@ -202,7 +202,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}
@ -222,7 +222,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}

View File

@ -943,10 +943,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(pp.size(), offset_),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(false),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{}
@ -970,10 +970,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(offsets),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(false),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{}
@ -997,10 +997,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(0),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(false),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{}
@ -1024,10 +1024,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(0),
distance_(distance),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(false),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{}
@ -1048,10 +1048,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(dict.subOrEmptyDict("surface"))
{
if (!coupleGroup_.valid())
@ -1130,10 +1130,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(dict.subOrEmptyDict("surface"))
{
if (mode != NEARESTPATCHFACE && mode != NEARESTPATCHFACEAMI)
@ -1177,10 +1177,10 @@ Foam::mappedPatchBase::mappedPatchBase
offsets_(mpb.offsets_),
distance_(mpb.distance_),
sameRegion_(mpb.sameRegion_),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(mpb.AMIReverse_),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(mpb.surfDict_)
{}
@ -1207,10 +1207,10 @@ Foam::mappedPatchBase::mappedPatchBase
),
distance_(mpb.distance_),
sameRegion_(mpb.sameRegion_),
mapPtr_(NULL),
AMIPtr_(NULL),
mapPtr_(nullptr),
AMIPtr_(nullptr),
AMIReverse_(mpb.AMIReverse_),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(mpb.surfDict_)
{}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -132,9 +132,9 @@ Foam::regionCoupledBase::regionCoupledBase
nbrPatchID_(-1),
nbrRegionName_(word::null),
sameRegion_(false),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(false),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(fileName("surface"))
{}
@ -150,9 +150,9 @@ Foam::regionCoupledBase::regionCoupledBase
nbrPatchID_(-1),
nbrRegionName_(dict.lookup("neighbourRegion")),
sameRegion_(nbrRegionName_ == patch_.boundaryMesh().mesh().name()),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
surfPtr_(NULL),
surfPtr_(nullptr),
surfDict_(dict.subOrEmptyDict("surface"))
{}
@ -168,7 +168,7 @@ Foam::regionCoupledBase::regionCoupledBase
nbrPatchID_(mpb.nbrPatchID_),
nbrRegionName_(mpb.nbrRegionName_),
sameRegion_(mpb.sameRegion_),
AMIPtr_(NULL),
AMIPtr_(nullptr),
AMIReverse_(mpb.AMIReverse_),
surfPtr_(mpb.surfPtr_),
surfDict_(mpb.surfDict_)

View File

@ -138,7 +138,7 @@ public:
virtual autoPtr<searchableSurface> clone() const
{
NotImplemented;
return autoPtr<searchableSurface>(NULL);
return autoPtr<searchableSurface>(nullptr);
}

View File

@ -54,7 +54,7 @@ namespace Foam
}
Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = NULL;
Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = nullptr;
const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>

View File

@ -116,7 +116,7 @@ protected:
if (usageTablePtr_)
{
delete usageTablePtr_;
usageTablePtr_ = NULL;
usageTablePtr_ = nullptr;
}
}
};
@ -243,7 +243,7 @@ public:
autoPtr<topoSetSource> clone() const
{
NotImplemented;
return autoPtr<topoSetSource>(NULL);
return autoPtr<topoSetSource>(nullptr);
}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -220,7 +220,7 @@ public:
autoPtr<topoSet> clone() const
{
NotImplemented;
return autoPtr<topoSet>(NULL);
return autoPtr<topoSet>(nullptr);
}

View File

@ -135,7 +135,7 @@ Foam::triSurfaceSearch::triSurfaceSearch(const triSurface& surface)
surface_(surface),
tolerance_(indexedOctree<treeDataTriSurface>::perturbTol()),
maxTreeDepth_(10),
treePtr_(NULL)
treePtr_(nullptr)
{}
@ -148,7 +148,7 @@ Foam::triSurfaceSearch::triSurfaceSearch
surface_(surface),
tolerance_(indexedOctree<treeDataTriSurface>::perturbTol()),
maxTreeDepth_(10),
treePtr_(NULL)
treePtr_(nullptr)
{
// Have optional non-standard search tolerance for gappy surfaces.
if (dict.readIfPresent("tolerance", tolerance_) && tolerance_ > 0)
@ -174,7 +174,7 @@ Foam::triSurfaceSearch::triSurfaceSearch
surface_(surface),
tolerance_(tolerance),
maxTreeDepth_(maxTreeDepth),
treePtr_(NULL)
treePtr_(nullptr)
{}

View File

@ -198,8 +198,8 @@ Foam::twoDPointCorrector::twoDPointCorrector(const polyMesh& mesh)
:
MeshObject<polyMesh, Foam::UpdateableMeshObject, twoDPointCorrector>(mesh),
required_(mesh_.nGeometricD() == 2),
planeNormalPtr_(NULL),
normalEdgeIndicesPtr_(NULL),
planeNormalPtr_(nullptr),
normalEdgeIndicesPtr_(nullptr),
isWedge_(false),
wedgeAxis_(Zero),
wedgeAngle_(0.0)