Fix NVHPC

NVIDIA · Jan 14, 2025 · d5fc52a · d5fc52a
1 parent 16fc795
commit d5fc52a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/thrust/thrust/optional.h b/thrust/thrust/optional.h
@@ -2013,6 +2013,12 @@ _CCCL_HOST_DEVICE auto optional_map_impl(Opt&& opt, F&& f)
     _CCCL_SUPPRESS_DEPRECATED_PUSH
     return optional<monostate>(monostate{});
     _CCCL_SUPPRESS_DEPRECATED_POP
+#    elif _CCCL_COMPILER(NVHPC)
+    // NVHPC cannot have a diagnostic pop after a return statement
+    _CCCL_SUPPRESS_DEPRECATED_PUSH
+    auto o = optional<monostate>(monostate{});
+    _CCCL_SUPPRESS_DEPRECATED_POP
+    return ::cuda::std::move(o);
 #    else
     _CCCL_SUPPRESS_DEPRECATED_PUSH
     return make_optional(monostate{});