commit 16f77ce4129c7228217887f85ee706425484d570
author Brad King <brad.king@kitware.com> Mon Jul 27 14:44:13 2020 +0000
committer Kitware Robot <kwrobot@kitware.com> Mon Jul 27 10:47:57 2020 -0400
tree 59ce3ba65efae32f4ac41d2929b4d5811686b8e3
parent 90c88302b52cb1f5095fcb0911091b3135d29ffb
parent 796466284bf745b55ad2d15dd51f894520245888

Merge topic 'bootstrap-intel' into release-3.18

796466284b bootstrap: Fix support for Intel compiler with modern GNU system compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5057

bootstrap

diff --git a/bootstrap b/bootstrap
index 18ab073..04067dc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1181,7 +1181,7 @@
 }
 #endif
 
-#if (__cplusplus >= 201703L || defined(__INTEL_COMPILER) && defined(__cpp_if_constexpr))
+#if (__cplusplus >= 201703L || defined(__INTEL_COMPILER) && defined(__cpp_deduction_guides))
 #include <optional>
 template <typename T,
           typename std::invoke_result<decltype(&T::get), T>::type = nullptr>