Skip to content

Commit ee4e25c

Browse files
authored
Change NULL pointer values to C++11 nullptr (#396)
1 parent ff0b489 commit ee4e25c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Adapter.C

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ void preciceAdapter::Adapter::initialize()
635635

636636
void preciceAdapter::Adapter::finalize()
637637
{
638-
if (NULL != precice_ && preciceInitialized_ && !isCouplingOngoing())
638+
if (nullptr != precice_ && preciceInitialized_ && !isCouplingOngoing())
639639
{
640640
DEBUG(adapterInfo("Finalizing the preCICE solver interface..."));
641641

@@ -782,7 +782,7 @@ bool preciceAdapter::Adapter::isCouplingOngoing()
782782
// the solver would try to access this method again,
783783
// giving a segmentation fault if precice_
784784
// was not available.
785-
if (NULL != precice_)
785+
if (nullptr != precice_)
786786
{
787787
isCouplingOngoing = precice_->isCouplingOngoing();
788788
}
@@ -1413,7 +1413,7 @@ void preciceAdapter::Adapter::end()
14131413
try
14141414
{
14151415
// Throw a warning if the simulation exited before the coupling was complete
1416-
if (NULL != precice_ && isCouplingOngoing())
1416+
if (nullptr != precice_ && isCouplingOngoing())
14171417
{
14181418
adapterInfo("The solver exited before the coupling was complete.", "warning");
14191419
}
@@ -1429,11 +1429,11 @@ void preciceAdapter::Adapter::teardown()
14291429
{
14301430
// If the solver interface was not deleted before, delete it now.
14311431
// Normally it should be deleted when isCouplingOngoing() becomes false.
1432-
if (NULL != precice_)
1432+
if (nullptr != precice_)
14331433
{
14341434
DEBUG(adapterInfo("Destroying the preCICE solver interface..."));
14351435
delete precice_;
1436-
precice_ = NULL;
1436+
precice_ = nullptr;
14371437
}
14381438

14391439
// Delete the preCICE solver interfaces
@@ -1535,35 +1535,35 @@ void preciceAdapter::Adapter::teardown()
15351535
}
15361536

15371537
// Delete the CHT module
1538-
if (NULL != CHT_)
1538+
if (nullptr != CHT_)
15391539
{
15401540
DEBUG(adapterInfo("Destroying the CHT module..."));
15411541
delete CHT_;
1542-
CHT_ = NULL;
1542+
CHT_ = nullptr;
15431543
}
15441544

15451545
// Delete the FSI module
1546-
if (NULL != FSI_)
1546+
if (nullptr != FSI_)
15471547
{
15481548
DEBUG(adapterInfo("Destroying the FSI module..."));
15491549
delete FSI_;
1550-
FSI_ = NULL;
1550+
FSI_ = nullptr;
15511551
}
15521552

15531553
// Delete the FF module
1554-
if (NULL != FF_)
1554+
if (nullptr != FF_)
15551555
{
15561556
DEBUG(adapterInfo("Destroying the FF module..."));
15571557
delete FF_;
1558-
FF_ = NULL;
1558+
FF_ = nullptr;
15591559
}
15601560

15611561
// Delete the Generic module
1562-
if (NULL != Generic_)
1562+
if (nullptr != Generic_)
15631563
{
15641564
DEBUG(adapterInfo("Destroying the Generic module..."));
15651565
delete Generic_;
1566-
Generic_ = NULL;
1566+
Generic_ = nullptr;
15671567
}
15681568

15691569
// NOTE: Delete your new module here

Adapter.H

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ private:
123123
bool preciceInitialized_ = false;
124124

125125
//- Conjugate Heat Transfer module object
126-
CHT::ConjugateHeatTransfer* CHT_ = NULL;
126+
CHT::ConjugateHeatTransfer* CHT_ = nullptr;
127127

128128
//- Fluid-Structure Interaction module object
129-
FSI::FluidStructureInteraction* FSI_ = NULL;
129+
FSI::FluidStructureInteraction* FSI_ = nullptr;
130130

131131
//- Fluid-Fluid module object
132-
FF::FluidFluid* FF_ = NULL;
132+
FF::FluidFluid* FF_ = nullptr;
133133

134134
//- Generic module object
135-
Generic::GenericInterface* Generic_ = NULL;
135+
Generic::GenericInterface* Generic_ = nullptr;
136136

137137
// NOTE: Add here a pointer for your new module object
138138

0 commit comments

Comments
 (0)