Update on "Make C10_NODISCARD macro more portable for nvcc+clang."

Make C10_NODISCARD macro more portable for nvcc+clang. Fixes #13118. Signed-off-by: Edward Z. Yang <ezyang@fb.com> gh-metadata: pytorch pytorch 20324 gh/ezyang/125/head
pytorch · May 9, 2019 · b7a435e · b7a435e
1 parent fd7c4e6
commit b7a435e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/c10/macros/Macros.h b/c10/macros/Macros.h
@@ -57,10 +57,8 @@
 // error when __has_cpp_attribute is given a scoped attribute in C mode.
 #elif __cplusplus && defined(__has_cpp_attribute)
 # if __has_cpp_attribute(clang::warn_unused_result)
-#  ifndef __CUDACC__
-#   undef C10_NODISCARD
-#   define C10_NODISCARD [[clang::warn_unused_result]]
-#  endif
+#  undef C10_NODISCARD
+#  define C10_NODISCARD [[clang::warn_unused_result]]
 # endif
 #endif