summaryrefslogtreecommitdiff
path: root/src/particlecontainer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/particlecontainer.cpp
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadmv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/particlecontainer.cpp')
-rw-r--r--src/particlecontainer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index 5f5b1b257..c839e3c8d 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -139,7 +139,7 @@ void ParticleVector::setLocally(int index, Particle *particle)
delLocally(index);
if (mIndexedElements.size() <= static_cast<unsigned>(index))
- mIndexedElements.resize(index + 1, NULL);
+ mIndexedElements.resize(index + 1, nullptr);
if (particle)
particle->disableAutoDelete();
@@ -157,7 +157,7 @@ void ParticleVector::delLocally(int index)
Particle *p = mIndexedElements[index];
if (p)
{
- mIndexedElements[index] = NULL;
+ mIndexedElements[index] = nullptr;
p->kill();
}
}
@@ -182,7 +182,7 @@ void ParticleVector::moveTo(float x, float y)
if ((*it)->isExtinct())
{
(*it)->kill();
- *it = NULL;
+ *it = nullptr;
}
}
}