From 7e80d9582e88b852ad642b7f83295342c840c704 Mon Sep 17 00:00:00 2001 From: Stephen Xu Date: Tue, 21 Mar 2023 15:52:57 +0000 Subject: [PATCH] Revert PR #1107 due to potential ill-formed NDR --- glm/detail/setup.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 77b1add3..6f0365b0 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -212,16 +212,14 @@ // N2346 #if GLM_COMPILER & GLM_COMPILER_CLANG # define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions) -#elif GLM_COMPILER & GLM_COMPILER_CUDA - // Do not use defaulted functions for CUDA compiler when function qualifiers are present -# define GLM_HAS_DEFAULTED_FUNCTIONS 0 #elif GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_DEFAULTED_FUNCTIONS 1 #else # define GLM_HAS_DEFAULTED_FUNCTIONS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ ((GLM_COMPILER & GLM_COMPILER_INTEL)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) + (GLM_COMPILER & GLM_COMPILER_CUDA)) || \ + ((GLM_COMPILER & GLM_COMPILER_HIP))) #endif // N2118