mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 05:08:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'bootstrap-intel'

Browse Source 
033a4b12a5 bootstrap: Extend C++17 check for our cast functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4139
This commit is contained in:
Brad King
2019-12-16 15:05:39 +00:00
committed by Kitware Robot
parent 43e6254a17 033a4b12a5
commit a1dc0a3a22
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap
View File

@@ -1168,10 +1168,20 @@ int check_cxx14()
}
#endif
#if __cplusplus >= 201703L
#if (__cplusplus >= 201703L || defined(__INTEL_COMPILER) && defined(__cpp_if_constexpr))
#include <optional>
template <typename T,
typename std::invoke_result<decltype(&T::get), T>::type = nullptr>
typename T::pointer get_ptr(T& item)
{
return item.get();
}
int check_cxx17()
{
// Intel compiler do not handle correctly 'decltype' inside 'invoke_result'
std::unique_ptr<int> u(new int(0));
get_ptr(u);
std::optional<int> oi = 0;
return oi.value();
}