From 311031ecd03dbfbf43e1df672a395f24b2e7d4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastia=CC=81n=20Barschkis?= Date: Fri, 6 Nov 2020 11:44:05 +0100 Subject: Cleanup: Use nullptr everywhere in fluid code Switched from NULL to nullptr. --- extern/mantaflow/preprocessed/mesh.h | 88 ++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'extern/mantaflow/preprocessed/mesh.h') diff --git a/extern/mantaflow/preprocessed/mesh.h b/extern/mantaflow/preprocessed/mesh.h index 4235b9508af..d3a69abc4ea 100644 --- a/extern/mantaflow/preprocessed/mesh.h +++ b/extern/mantaflow/preprocessed/mesh.h @@ -223,7 +223,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::clear", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -248,7 +248,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::fromShape", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Shape &shape = *_args.getPtr("shape", 0, &_lock); @@ -275,7 +275,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::advectInGrid", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; FlagGrid &flags = *_args.getPtr("flags", 0, &_lock); @@ -303,7 +303,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::scale", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Vec3 s = _args.get("s", 0, &_lock); @@ -329,7 +329,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::offset", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Vec3 o = _args.get("o", 0, &_lock); @@ -355,7 +355,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::rotate", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Vec3 thetas = _args.get("thetas", 0, &_lock); @@ -381,7 +381,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::computeVelocity", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Mesh &oldMesh = *_args.getPtr("oldMesh", 0, &_lock); @@ -409,7 +409,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::load", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; std::string name = _args.get("name", 0, &_lock); @@ -435,7 +435,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::save", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; std::string name = _args.get("name", 0, &_lock); @@ -460,7 +460,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::computeLevelset", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; LevelsetGrid &levelset = *_args.getPtr("levelset", 0, &_lock); @@ -488,7 +488,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::getLevelset", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Real sigma = _args.get("sigma", 0, &_lock); @@ -518,7 +518,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::applyMeshToGrid", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; GridBase *grid = _args.getPtr("grid", 0, &_lock); @@ -548,7 +548,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::getNodesDataPointer", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -573,7 +573,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::getTrisDataPointer", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -734,7 +734,7 @@ class Mesh : public PbClass { Mesh *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "Mesh::create", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; PbType type = _args.get("type", 0, &_lock); @@ -852,7 +852,7 @@ class MeshDataBase : public PbClass { virtual MeshDataBase *clone() { assertMsg(false, "Dont use, override..."); - return NULL; + return nullptr; } virtual MdataType getType() const { @@ -952,7 +952,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::clear", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -978,7 +978,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::setSource", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Grid *grid = _args.getPtr>("grid", 0, &_lock); @@ -1026,7 +1026,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::setConst", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; T s = _args.get("s", 0, &_lock); @@ -1052,7 +1052,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::setConstRange", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; T s = _args.get("s", 0, &_lock); @@ -1080,7 +1080,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::copyFrom", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1105,7 +1105,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::add", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1131,7 +1131,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::sub", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1157,7 +1157,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::addConst", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; T s = _args.get("s", 0, &_lock); @@ -1183,7 +1183,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::addScaled", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1210,7 +1210,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::mult", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1236,7 +1236,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::multConst", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; T s = _args.get("s", 0, &_lock); @@ -1262,7 +1262,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::safeDiv", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const MeshDataImpl &a = *_args.getPtr>("a", 0, &_lock); @@ -1288,7 +1288,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::clamp", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Real min = _args.get("min", 0, &_lock); @@ -1315,7 +1315,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::clampMin", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Real vmin = _args.get("vmin", 0, &_lock); @@ -1341,7 +1341,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::clampMax", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; Real vmax = _args.get("vmax", 0, &_lock); @@ -1367,7 +1367,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::getMaxAbs", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -1391,7 +1391,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::getMax", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -1415,7 +1415,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::getMin", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -1431,7 +1431,7 @@ template class MeshDataImpl : public MeshDataBase { } } - T sum(const MeshDataImpl *t = NULL, const int itype = 0) const; + T sum(const MeshDataImpl *t = nullptr, const int itype = 0) const; static PyObject *_W_36(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { @@ -1439,10 +1439,10 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::sum", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; - const MeshDataImpl *t = _args.getPtrOpt>("t", 0, NULL, &_lock); + const MeshDataImpl *t = _args.getPtrOpt>("t", 0, nullptr, &_lock); const int itype = _args.getOpt("itype", 1, 0, &_lock); pbo->_args.copy(_args); _retval = toPy(pbo->sum(t, itype)); @@ -1465,7 +1465,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::sumSquare", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -1489,7 +1489,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::sumMagnitude", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); @@ -1514,7 +1514,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::setConstIntFlag", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; T s = _args.get("s", 0, &_lock); @@ -1542,7 +1542,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::printMdata", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; IndexInt start = _args.getOpt("start", 0, -1, &_lock); @@ -1571,7 +1571,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::save", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const std::string name = _args.get("name", 0, &_lock); @@ -1596,7 +1596,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::load", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const std::string name = _args.get("name", 0, &_lock); @@ -1622,7 +1622,7 @@ template class MeshDataImpl : public MeshDataBase { MeshDataImpl *pbo = dynamic_cast(Pb::objFromPy(_self)); bool noTiming = _args.getOpt("notiming", -1, 0); pbPreparePlugin(pbo->getParent(), "MeshDataImpl::getDataPointer", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; pbo->_args.copy(_args); -- cgit v1.2.3