Skip to content

Commit 178b816

Browse files
sifakismatthewdcong
authored andcommitted
restricting scope of CALL_CUBS macro
The CALL_CUBS macro has a slightly different definition in the two similar code files that use it, namely PointsToGrid.cuh and TopologyBuilder.cuh. This fix restricts the scope of each macro definition to just the code file where it is used. Signed-off-by: Matthew Cong <mcong@nvidia.com>
1 parent 37c1592 commit 178b816

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

nanovdb/nanovdb/tools/cuda/PointsToGrid.cuh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,13 @@ inline void PointsToGrid<BuildT, ResourceT>::processLeafNodes(size_t pointCount)
11391139

11401140
//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
11411141

1142+
// Undefine utility macro for cub functions
1143+
#ifdef CALL_CUBS
1144+
#undef CALL_CUBS
1145+
#endif
1146+
1147+
//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1148+
11421149
template<typename BuildT, typename ResourceT>
11431150
template<typename PtrT>
11441151
inline void PointsToGrid<BuildT, ResourceT>::processPoints(const PtrT, size_t pointCount)

nanovdb/nanovdb/tools/cuda/TopologyBuilder.cuh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,13 @@ inline void TopologyBuilder<BuildT>::processLeafOffsets(cudaStream_t stream)
440440

441441
//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
442442

443+
// Undefine utility macro for cub functions
444+
#ifdef CALL_CUBS
445+
#undef CALL_CUBS
446+
#endif
447+
448+
//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
449+
443450
namespace topology::detail {
444451

445452
template <typename BuildT>

0 commit comments

Comments
 (0)