Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Fix 32-bit MSVC builds. #1582

Merged
merged 1 commit into from
Dec 17, 2021
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions thrust/system/cuda/memory_resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ namespace cuda
namespace detail
{

typedef cudaError_t (*allocation_fn)(void **, std::size_t);
typedef cudaError_t (*deallocation_fn)(void *);
typedef cudaError_t (CUDARTAPI *allocation_fn)(void **, std::size_t);
typedef cudaError_t (CUDARTAPI *deallocation_fn)(void *);

template<allocation_fn Alloc, deallocation_fn Dealloc, typename Pointer>
class cuda_memory_resource final : public mr::memory_resource<Pointer>
Expand Down Expand Up @@ -79,7 +79,7 @@ namespace detail
}
};

inline cudaError_t cudaMallocManaged(void ** ptr, std::size_t bytes)
inline cudaError_t CUDARTAPI cudaMallocManaged(void ** ptr, std::size_t bytes)
{
return ::cudaMallocManaged(ptr, bytes, cudaMemAttachGlobal);
}
Expand Down