Skip to content

Fix deprecated use of 0/NULL #3817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dtolnay wants to merge 1 commit into from
Closed

Fix deprecated use of 0/NULL #3817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion faiss/gpu/test/demo_ivfpq_indexing_gpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

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

Expand Down
5 changes: 4 additions & 1 deletion faiss/gpu/utils/Timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ namespace faiss {
namespace gpu {

KernelTimer::KernelTimer(cudaStream_t stream)
: startEvent_(0), stopEvent_(0), stream_(stream), valid_(true) {
: startEvent_(nullptr),
stopEvent_(nullptr),
stream_(stream),
valid_(true) {
CUDA_VERIFY(cudaEventCreate(&startEvent_));
CUDA_VERIFY(cudaEventCreate(&stopEvent_));

Expand Down
2 changes: 1 addition & 1 deletion faiss/gpu/utils/Timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class KernelTimer {
public:
/// Constructor starts the timer and adds an event into the current
/// device stream
KernelTimer(cudaStream_t stream = 0);
KernelTimer(cudaStream_t stream = nullptr);

/// Destructor releases event resources
~KernelTimer();
Expand Down