diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-24 12:59:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-07-24 12:59:11 (GMT) |
| commit | e82bc5940cf7c3889efc8df630989e89aacdbde6 (patch) | |
| tree | f3f9392e50a57b4b8b57ff340e16e8035e557f8e | |
| parent | e817818926a69363487519f58562cc6412947a89 (diff) | |
| parent | 796466284bf745b55ad2d15dd51f894520245888 (diff) | |
| download | CMake-e82bc5940cf7c3889efc8df630989e89aacdbde6.zip CMake-e82bc5940cf7c3889efc8df630989e89aacdbde6.tar.gz CMake-e82bc5940cf7c3889efc8df630989e89aacdbde6.tar.bz2 | |
Merge branch 'bootstrap-intel' into release-3.17
Merge-request: !5057
| -rwxr-xr-x | bootstrap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1168,7 +1168,7 @@ int check_cxx14() } #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> |