Merge pull request #273 from NVIDIA/bugfix/nv_target_xlc_pedantic

Fix pedantic warnings in <nv/target> on IBM xlc.
NVIDIA · May 6, 2022 · 017cb64 · 017cb64
2 parents ad67435 + ace215a
commit 017cb64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/include/nv/detail/__target_macros b/include/nv/detail/__target_macros
@@ -456,7 +456,7 @@
 #  define _NV_TARGET_DISPATCH(...) _NV_BLOCK_EXPAND(_NV_DISPATCH_N_ARY(_NV_TARGET_DISPATCH_HANDLE, __VA_ARGS__))
 
 // NV_IF_TARGET supports a false statement provided as a variadic macro
-#  define NV_IF_TARGET(cond, t, ...)    _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, t, __VA_ARGS__))
+#  define NV_IF_TARGET(cond, ...)    _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, __VA_ARGS__))
 #  define NV_IF_ELSE_TARGET(cond, t, f) _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, t, f))
 #  define NV_DISPATCH_TARGET(...)       _NV_TARGET_DISPATCH(__VA_ARGS__)
 

diff --git a/include/nv/target b/include/nv/target
@@ -35,8 +35,9 @@
 #  define _NV_BITSET_ATTRIBUTE
 #endif
 
-#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-    (defined(_MSC_VER) && _MSVC_LANG >= 201103L)
+#if (!defined(__ibmxl__)) && \
+    ((defined(__cplusplus) && __cplusplus >= 201103L) || \
+     (defined(_MSC_VER) && _MSVC_LANG >= 201103L))
 #  define _NV_TARGET_CPP11
 #endif