From e204df0e663c44f05a28f576f4135bfba2b5cfcc Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Thu, 13 Aug 2020 16:18:57 -0600 Subject: [PATCH] nvcc compiler should be EDG-based, but fails test (#1818) Our nvcc compilers (10.1.243 and 9.2.X) do not define the correct value for `FMT_USE_UDL_TEMPLATE` and then end up with an error later on in the build. Explicitly search for `__NVCC__` symbol not being defined. Might want to instead use `FMT_NVCC` or some other check, but the raw `__EDG_VERSION__` check is not working correctly for nvcc. --- include/fmt/format.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fmt/format.h b/include/fmt/format.h index dc88a984..19a71fc0 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -145,7 +145,7 @@ FMT_END_NAMESPACE (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 501) && \ ((FMT_GCC_VERSION >= 604 && __cplusplus >= 201402L) || \ FMT_CLANG_VERSION >= 304) && \ - !defined(__PGI) + !defined(__PGI) && !defined(__NVCC__) # define FMT_USE_UDL_TEMPLATE 1 # else # define FMT_USE_UDL_TEMPLATE 0