| commit | e82bc5940cf7c3889efc8df630989e89aacdbde6 | [log] [tgz] |
|---|---|---|
| author | Brad King <brad.king@kitware.com> | Fri Jul 24 08:59:11 2020 -0400 |
| committer | Brad King <brad.king@kitware.com> | Fri Jul 24 08:59:11 2020 -0400 |
| tree | f3f9392e50a57b4b8b57ff340e16e8035e557f8e | |
| parent | e817818926a69363487519f58562cc6412947a89 [diff] | |
| parent | 796466284bf745b55ad2d15dd51f894520245888 [diff] |
Merge branch 'bootstrap-intel' into release-3.17 Merge-request: !5057
diff --git a/bootstrap b/bootstrap index 03d9ef0..6964683 100755 --- a/bootstrap +++ b/bootstrap
@@ -1168,7 +1168,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>