diff --git a/faiss/faiss/impl/platform_macros.h b/faiss/faiss/impl/platform_macros.h index b7aa4111..0ea158bc 100644 --- a/faiss/faiss/impl/platform_macros.h +++ b/faiss/faiss/impl/platform_macros.h @@ -50,8 +50,11 @@ inline int __builtin_ctzll(uint64_t x) { } #endif -// cudatoolkit provides __builtin_ctz for NVCC >= 11.0 -#if !defined(__CUDACC__) || __CUDACC_VER_MAJOR__ < 11 +// cudatoolkit provides __builtin_ctz for NVCC >= 11.0. +// clang-cl provides __builtin_ctz as a real compiler builtin, so defining our +// own overload makes calls ambiguous (e.g. from boost/core/bit.hpp). Guard it +// with #ifndef __clang__ to match every sibling intrinsic in this file. +#if !defined(__clang__) && (!defined(__CUDACC__) || __CUDACC_VER_MAJOR__ < 11) inline int __builtin_ctz(unsigned long x) { unsigned long ret; _BitScanForward(&ret, x);