diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-06 13:44:05 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-11-06 14:06:05 +0300 |
commit | 311031ecd03dbfbf43e1df672a395f24b2e7d4d3 (patch) | |
tree | baa75eb4b3e62d1caeb710d39291112e41112b37 /extern/mantaflow/helper/pwrapper/pvec3.cpp | |
parent | 37b155420b7cba189e69f648728be967943c4ec0 (diff) |
Cleanup: Use nullptr everywhere in fluid code
Switched from NULL to nullptr.
Diffstat (limited to 'extern/mantaflow/helper/pwrapper/pvec3.cpp')
-rw-r--r-- | extern/mantaflow/helper/pwrapper/pvec3.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/extern/mantaflow/helper/pwrapper/pvec3.cpp b/extern/mantaflow/helper/pwrapper/pvec3.cpp index 69bde2a2ad0..1dca44d5e5c 100644 --- a/extern/mantaflow/helper/pwrapper/pvec3.cpp +++ b/extern/mantaflow/helper/pwrapper/pvec3.cpp @@ -77,13 +77,13 @@ static PyMemberDef PbVec3Members[] = { {(char *)"x", T_FLOAT, offsetof(PbVec3, data), 0, (char *)"X"}, {(char *)"y", T_FLOAT, offsetof(PbVec3, data) + sizeof(float), 0, (char *)"Y"}, {(char *)"z", T_FLOAT, offsetof(PbVec3, data) + sizeof(float) * 2, 0, (char *)"Z"}, - {NULL} // Sentinel + {nullptr} // Sentinel }; static PyMethodDef PbVec3Methods[] = { //{"name", (PyCFunction)Noddy_name, METH_NOARGS, "Return the name, combining the first and last //name" }, - {NULL} // Sentinel + {nullptr} // Sentinel }; // operator overloads @@ -240,24 +240,24 @@ static PyNumberMethods PbVec3NumberMethods = { #endif PyTypeObject PbVec3Type = { - PyVarObject_HEAD_INIT(NULL, 0) "manta.vec3", /* tp_name */ - sizeof(PbVec3), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PbVec3Dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)PbVec3Repr, /* tp_repr */ - &PbVec3NumberMethods, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ + PyVarObject_HEAD_INIT(nullptr, 0) "manta.vec3", /* tp_name */ + sizeof(PbVec3), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)PbVec3Dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)PbVec3Repr, /* tp_repr */ + &PbVec3NumberMethods, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ #if PY_MAJOR_VERSION >= 3 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ #else @@ -297,7 +297,7 @@ struct PbVec4 { }; static PyMethodDef PbVec4Methods[] = { - {NULL} // Sentinel + {nullptr} // Sentinel }; static PyMemberDef PbVec4Members[] = { @@ -305,7 +305,7 @@ static PyMemberDef PbVec4Members[] = { {(char *)"y", T_FLOAT, offsetof(PbVec4, data) + sizeof(float) * 1, 0, (char *)"Y"}, {(char *)"z", T_FLOAT, offsetof(PbVec4, data) + sizeof(float) * 2, 0, (char *)"Z"}, {(char *)"t", T_FLOAT, offsetof(PbVec4, data) + sizeof(float) * 3, 0, (char *)"T"}, - {NULL} // Sentinel + {nullptr} // Sentinel }; static void PbVec4Dealloc(PbVec4 *self) @@ -352,24 +352,24 @@ static PyObject *PbVec4Repr(PbVec4 *self) } PyTypeObject PbVec4Type = { - PyVarObject_HEAD_INIT(NULL, 0) "manta.vec4", /* tp_name */ - sizeof(PbVec4), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)PbVec4Dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)PbVec4Repr, /* tp_repr */ - NULL, // &PbVec4NumberMethods, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ + PyVarObject_HEAD_INIT(nullptr, 0) "manta.vec4", /* tp_name */ + sizeof(PbVec4), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)PbVec4Dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)PbVec4Repr, /* tp_repr */ + nullptr, // &PbVec4NumberMethods, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ #if PY_MAJOR_VERSION >= 3 Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ #else |