commit b76fa1b62a55d02fbce15ecea07b382f57cf6907
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:58 2020 -0400
tree 67c1f79b4d481f4ca3fc53654993599948134c76
parent 95adaa5b71244ab7212372ab4c9d3642e0df32a6
parent 796466284bf745b55ad2d15dd51f894520245888

Merge topic 'bootstrap-intel'

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 0134e0c..2ef0fbb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1188,7 +1188,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>