mirrors
/
faiss
mirror of https://github.com/facebookresearch/faiss.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix deprecated use of 0/NULL in faiss/python/python_callbacks.cpp + 1 

Summary:
`nullptr` is typesafe. `0` and `NULL` are not. In the future, only `nullptr` will be allowed.

This diff helps us embrace the future _now_ in service of enabling `-Wzero-as-null-pointer-constant`.

Reviewed By: palmje

Differential Revision: D56650318

fbshipit-source-id: 803ae62114c39143b65946f6f0387715eaf7f534
pull/3365/head^2
Richard Barnes 2024-04-27 09:37:26 -07:00 committed by Facebook GitHub Bot
parent a233bc93e3
commit c5599a0684
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
faiss/python/python_callbacks.cpp
View File

@ -46,7 +46,7 @@ size_t PyCallbackIOWriter::operator()(
size_t wi = ws > bs ? bs : ws;
PyObject* result = PyObject_CallFunction(
callback, "(N)", PyBytes_FromStringAndSize(ptr, wi));
if (result == NULL) {
if (result == nullptr) {
FAISS_THROW_MSG("py err");
}
// TODO check nb of bytes written
@ -77,7 +77,7 @@ size_t PyCallbackIOReader::operator()(void* ptrv, size_t size, size_t nitems) {
while (rs > 0) {
size_t ri = rs > bs ? bs : rs;
PyObject* result = PyObject_CallFunction(callback, "(n)", ri);
if (result == NULL) {
if (result == nullptr) {
FAISS_THROW_MSG("propagate py error");
}
if (!PyBytes_Check(result)) {
@ -122,7 +122,7 @@ bool PyCallbackIDSelector::is_member(faiss::idx_t id) const {
FAISS_THROW_IF_NOT((id >> 32) == 0);
PyThreadLock gil;
PyObject* result = PyObject_CallFunction(callback, "(n)", int(id));
if (result == NULL) {
if (result == nullptr) {
FAISS_THROW_MSG("propagate py error");
}
bool b = PyObject_IsTrue(result);