Skip to content

Commit c418b30

Browse files
David Tolnayfacebook-github-bot
David Tolnay
authored andcommitted
Fix deprecated use of 0/NULL (facebookresearch#3817)
Summary: Pull Request resolved: facebookresearch#3817 `nullptr` is typesafe. `0` and `NULL` are not. We are interested in enabling `-Wzero-as-null-pointer-constant` for first-party code, and only `nullptr` will be allowed. Reviewed By: zertosh Differential Revision: D62083883 fbshipit-source-id: 9f19434ff72faa1444dec72ec182a41398b575fe
1 parent 383b5d9 commit c418b30

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

faiss/gpu/test/demo_ivfpq_indexing_gpu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
double elapsed() {
2222
struct timeval tv;
23-
gettimeofday(&tv, NULL);
23+
gettimeofday(&tv, nullptr);
2424
return tv.tv_sec + tv.tv_usec * 1e-6;
2525
}
2626

faiss/gpu/utils/Timer.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ namespace faiss {
1414
namespace gpu {
1515

1616
KernelTimer::KernelTimer(cudaStream_t stream)
17-
: startEvent_(0), stopEvent_(0), stream_(stream), valid_(true) {
17+
: startEvent_(nullptr),
18+
stopEvent_(nullptr),
19+
stream_(stream),
20+
valid_(true) {
1821
CUDA_VERIFY(cudaEventCreate(&startEvent_));
1922
CUDA_VERIFY(cudaEventCreate(&stopEvent_));
2023

faiss/gpu/utils/Timer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class KernelTimer {
1818
public:
1919
/// Constructor starts the timer and adds an event into the current
2020
/// device stream
21-
KernelTimer(cudaStream_t stream = 0);
21+
KernelTimer(cudaStream_t stream = nullptr);
2222

2323
/// Destructor releases event resources
2424
~KernelTimer();

0 commit comments

Comments
 (0)