diff options
author | Brad King <brad.king@kitware.com> | 2020-07-27 14:44:13 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-27 14:47:58 (GMT) |
commit | b76fa1b62a55d02fbce15ecea07b382f57cf6907 (patch) | |
tree | 67c1f79b4d481f4ca3fc53654993599948134c76 /bootstrap | |
parent | 95adaa5b71244ab7212372ab4c9d3642e0df32a6 (diff) | |
parent | 796466284bf745b55ad2d15dd51f894520245888 (diff) | |
download | CMake-b76fa1b62a55d02fbce15ecea07b382f57cf6907.zip CMake-b76fa1b62a55d02fbce15ecea07b382f57cf6907.tar.gz CMake-b76fa1b62a55d02fbce15ecea07b382f57cf6907.tar.bz2 |
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
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1188,7 +1188,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> |